diff --git a/jscomp/test/dist-es6/jscomp/test/mt.mjs b/jscomp/test/dist-es6/jscomp/test/mt.mjs
index 20ed990f25..a204957272 100644
--- a/jscomp/test/dist-es6/jscomp/test/mt.mjs
+++ b/jscomp/test/dist-es6/jscomp/test/mt.mjs
@@ -1,11 +1,11 @@
 // Generated by Melange
 
-import * as Path from "path";
 import * as Curry from "melange.js/curry.mjs";
+import * as Stdlib__Array from "melange/array.mjs";
+import * as Stdlib__List from "melange/list.mjs";
 import * as Assert from "assert";
+import * as Path from "path";
 import * as Process from "process";
-import * as Stdlib__List from "melange/list.mjs";
-import * as Stdlib__Array from "melange/array.mjs";
 
 function assert_fail(msg) {
   Assert.fail(undefined, undefined, msg, "");
diff --git a/jscomp/test/dist/jscomp/test/406_primitive_test.js b/jscomp/test/dist/jscomp/test/406_primitive_test.js
index bb0381ee5c..53cdb6ed61 100644
--- a/jscomp/test/dist/jscomp/test/406_primitive_test.js
+++ b/jscomp/test/dist/jscomp/test/406_primitive_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/a_filename_test.js b/jscomp/test/dist/jscomp/test/a_filename_test.js
index e904189677..42a395f1bd 100644
--- a/jscomp/test/dist/jscomp/test/a_filename_test.js
+++ b/jscomp/test/dist/jscomp/test/a_filename_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Ext_filename_test = require("./ext_filename_test.js");
 var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
-var Ext_filename_test = require("./ext_filename_test.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/a_list_test.js b/jscomp/test/dist/jscomp/test/a_list_test.js
index a0a0e85e13..6c7932958c 100644
--- a/jscomp/test/dist/jscomp/test/a_list_test.js
+++ b/jscomp/test/dist/jscomp/test/a_list_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Ext_list_test = require("./ext_list_test.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "drop",
diff --git a/jscomp/test/dist/jscomp/test/a_string_test.js b/jscomp/test/dist/jscomp/test/a_string_test.js
index bab581feab..7164282552 100644
--- a/jscomp/test/dist/jscomp/test/a_string_test.js
+++ b/jscomp/test/dist/jscomp/test/a_string_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Ext_string_test = require("./ext_string_test.js");
 var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
-var Ext_string_test = require("./ext_string_test.js");
 
 var suites_0 = [
   "split",
diff --git a/jscomp/test/dist/jscomp/test/app_root_finder.js b/jscomp/test/dist/jscomp/test/app_root_finder.js
index c4844ac164..fe266f82e2 100644
--- a/jscomp/test/dist/jscomp/test/app_root_finder.js
+++ b/jscomp/test/dist/jscomp/test/app_root_finder.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Stdlib = require("melange/stdlib.js");
 var Fs = require("fs");
 var Path = require("path");
-var Stdlib = require("melange/stdlib.js");
 
 var package_json = "package.json";
 
diff --git a/jscomp/test/dist/jscomp/test/ari_regress_test.js b/jscomp/test/dist/jscomp/test/ari_regress_test.js
index 60fc632d97..cbd790bd11 100644
--- a/jscomp/test/dist/jscomp/test/ari_regress_test.js
+++ b/jscomp/test/dist/jscomp/test/ari_regress_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var g = 7;
 
diff --git a/jscomp/test/dist/jscomp/test/arith_lexer.js b/jscomp/test/dist/jscomp/test/arith_lexer.js
index 6bd974f588..207be04dd2 100644
--- a/jscomp/test/dist/jscomp/test/arith_lexer.js
+++ b/jscomp/test/dist/jscomp/test/arith_lexer.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_format = require("melange.js/caml_format.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_format = require("melange.js/caml_format.js");
 var Stdlib__Lexing = require("melange/lexing.js");
 
 var __ocaml_lex_tables = {
diff --git a/jscomp/test/dist/jscomp/test/arity_deopt.js b/jscomp/test/dist/jscomp/test/arity_deopt.js
index c26529a906..9e2b367682 100644
--- a/jscomp/test/dist/jscomp/test/arity_deopt.js
+++ b/jscomp/test/dist/jscomp/test/arity_deopt.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/array_safe_get.js b/jscomp/test/dist/jscomp/test/array_safe_get.js
index 827735caf5..2aadfcea9d 100644
--- a/jscomp/test/dist/jscomp/test/array_safe_get.js
+++ b/jscomp/test/dist/jscomp/test/array_safe_get.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib = require("melange/stdlib.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib = require("melange/stdlib.js");
 
 var x = [
   1,
diff --git a/jscomp/test/dist/jscomp/test/array_subtle_test.js b/jscomp/test/dist/jscomp/test/array_subtle_test.js
index fa46d22a88..0f7b9debf6 100644
--- a/jscomp/test/dist/jscomp/test/array_subtle_test.js
+++ b/jscomp/test/dist/jscomp/test/array_subtle_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/array_test.js b/jscomp/test/dist/jscomp/test/array_test.js
index 9cd64ef8bb..2ea7091186 100644
--- a/jscomp/test/dist/jscomp/test/array_test.js
+++ b/jscomp/test/dist/jscomp/test/array_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_array = require("melange.js/caml_array.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Array = require("melange/array.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 function starts_with(xs, prefix, p) {
   var H = /* @__PURE__ */Caml_exceptions.create("H");
diff --git a/jscomp/test/dist/jscomp/test/ast_abstract_test.js b/jscomp/test/dist/jscomp/test/ast_abstract_test.js
index 32c92d24ad..498044ddc1 100644
--- a/jscomp/test/dist/jscomp/test/ast_abstract_test.js
+++ b/jscomp/test/dist/jscomp/test/ast_abstract_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_mapperRt = require("melange.js/js_mapperRt.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 8ed8c22932..8de3af80e4 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
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Js__Js_mapperRt = require("melange.js/js_mapperRt.js");
 var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
-var Js__Js_mapperRt = require("melange.js/js_mapperRt.js");
 
 var suites = {
   contents: /* [] */0
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 16f2878636..811215be7f 100644
--- a/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js
+++ b/jscomp/test/dist/jscomp/test/ast_mapper_defensive_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_mapperRt = require("melange.js/js_mapperRt.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/basic_module_test.js b/jscomp/test/dist/jscomp/test/basic_module_test.js
index a2edc9fa1a..1f5c85b534 100644
--- a/jscomp/test/dist/jscomp/test/basic_module_test.js
+++ b/jscomp/test/dist/jscomp/test/basic_module_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
-var Offset = require("./offset.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
+var Offset = require("./offset.js");
 
 var count = {
   contents: 0
diff --git a/jscomp/test/dist/jscomp/test/bench.js b/jscomp/test/dist/jscomp/test/bench.js
index fc2d243b12..ed457f338c 100644
--- a/jscomp/test/dist/jscomp/test/bench.js
+++ b/jscomp/test/dist/jscomp/test/bench.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_array = require("melange.js/caml_array.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_array = require("melange.js/caml_array.js");
 
 function map(f, a) {
   var f$1 = Curry.__1(f);
diff --git a/jscomp/test/dist/jscomp/test/block_alias_test.js b/jscomp/test/dist/jscomp/test/block_alias_test.js
index df81f3514e..51dafd368f 100644
--- a/jscomp/test/dist/jscomp/test/block_alias_test.js
+++ b/jscomp/test/dist/jscomp/test/block_alias_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/bs_MapInt_test.js b/jscomp/test/dist/jscomp/test/bs_MapInt_test.js
index 7fc2ce41d3..d44357d2fa 100644
--- a/jscomp/test/dist/jscomp/test/bs_MapInt_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_MapInt_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Js__Js_exn = require("melange.js/js_exn.js");
 var Belt__Belt_MapInt = require("melange.belt/belt_MapInt.js");
+var Js__Js_exn = require("melange.js/js_exn.js");
 
 function should(b) {
   if (!b) {
diff --git a/jscomp/test/dist/jscomp/test/bs_array_test.js b/jscomp/test/dist/jscomp/test/bs_array_test.js
index ca49d1cf85..6b5781d615 100644
--- a/jscomp/test/dist/jscomp/test/bs_array_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_array_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
 var Js__Js_list = require("melange.js/js_list.js");
 var Js__Js_vector = require("melange.js/js_vector.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
-var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js b/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
index 45a446b11e..86deb3ba1d 100644
--- a/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
+++ b/jscomp/test/dist/jscomp/test/bs_auto_uncurry.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_splice_call = require("melange.js/caml_splice_call.js");
+var Curry = require("melange.js/curry.js");
 
 var Curry$1 = {};
 
diff --git a/jscomp/test/dist/jscomp/test/bs_float_test.js b/jscomp/test/dist/jscomp/test/bs_float_test.js
index 6211ab76ca..570f15694d 100644
--- a/jscomp/test/dist/jscomp/test/bs_float_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_float_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Belt__Belt_Float = require("melange.belt/belt_Float.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_hashmap_test.js b/jscomp/test/dist/jscomp/test/bs_hashmap_test.js
index 642b2a9956..9726c6ef18 100644
--- a/jscomp/test/dist/jscomp/test/bs_hashmap_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_hashmap_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
 var Array_data_util = require("./array_data_util.js");
-var Stdlib__Hashtbl = require("melange/hashtbl.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_HashMap = require("melange.belt/belt_HashMap.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
 var Belt__Belt_SortArray = require("melange.belt/belt_SortArray.js");
 var Belt__Belt_internalBucketsType = require("melange.belt/belt_internalBucketsType.js");
+var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
+var Stdlib__Hashtbl = require("melange/hashtbl.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_hashset_int_test.js b/jscomp/test/dist/jscomp/test/bs_hashset_int_test.js
index a58fcc4c51..4a4567a8f2 100644
--- a/jscomp/test/dist/jscomp/test/bs_hashset_int_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_hashset_int_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
-var Belt__Belt_SetInt = require("melange.belt/belt_SetInt.js");
 var Belt__Belt_HashSetInt = require("melange.belt/belt_HashSetInt.js");
+var Belt__Belt_SetInt = require("melange.belt/belt_SetInt.js");
 var Belt__Belt_SortArrayInt = require("melange.belt/belt_SortArrayInt.js");
 var Belt__Belt_internalBucketsType = require("melange.belt/belt_internalBucketsType.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 a69d805ee9..3bcbc0c6ae 100644
--- a/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_hashtbl_string_test.js
@@ -1,16 +1,16 @@
 // Generated by Melange
 'use strict';
 
-var Caml = require("melange.js/caml.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
-var Stdlib__Hashtbl = require("melange/hashtbl.js");
 var Belt__Belt_HashMap = require("melange.belt/belt_HashMap.js");
-var Belt__Belt_MapDict = require("melange.belt/belt_MapDict.js");
-var Caml_hash_primitive = require("melange.js/caml_hash_primitive.js");
 var Belt__Belt_HashMapInt = require("melange.belt/belt_HashMapInt.js");
-var Belt__Belt_HashSetInt = require("melange.belt/belt_HashSetInt.js");
 var Belt__Belt_HashMapString = require("melange.belt/belt_HashMapString.js");
+var Belt__Belt_HashSetInt = require("melange.belt/belt_HashSetInt.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
+var Belt__Belt_MapDict = require("melange.belt/belt_MapDict.js");
 var Belt__Belt_internalBucketsType = require("melange.belt/belt_internalBucketsType.js");
+var Caml = require("melange.js/caml.js");
+var Caml_hash_primitive = require("melange.js/caml_hash_primitive.js");
+var Stdlib__Hashtbl = require("melange/hashtbl.js");
 
 function hash_string(s) {
   return Caml_hash_primitive.caml_hash_final_mix(Caml_hash_primitive.caml_hash_mix_string(0, s));
diff --git a/jscomp/test/dist/jscomp/test/bs_int_test.js b/jscomp/test/dist/jscomp/test/bs_int_test.js
index 05f3b4f73b..1597d318a0 100644
--- a/jscomp/test/dist/jscomp/test/bs_int_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_int_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Belt__Belt_Int = require("melange.belt/belt_Int.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_list_test.js b/jscomp/test/dist/jscomp/test/bs_list_test.js
index b989647692..eaef9efdff 100644
--- a/jscomp/test/dist/jscomp/test/bs_list_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_list_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Caml = require("melange.js/caml.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
-var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 e3ed1f2270..012d511c20 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
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
-var Belt__Belt_Map = require("melange.belt/belt_Map.js");
 var Array_data_util = require("./array_data_util.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
+var Belt__Belt_Map = require("melange.belt/belt_Map.js");
 var Belt__Belt_MapDict = require("melange.belt/belt_MapDict.js");
 var Belt__Belt_SetDict = require("melange.belt/belt_SetDict.js");
+var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_map_test.js b/jscomp/test/dist/jscomp/test/bs_map_test.js
index a10f76c76c..7337fe6621 100644
--- a/jscomp/test/dist/jscomp/test/bs_map_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_map_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_MapInt = require("melange.belt/belt_MapInt.js");
 var Belt__Belt_SetInt = require("melange.belt/belt_SetInt.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_min_max_test.js b/jscomp/test/dist/jscomp/test/bs_min_max_test.js
index d318672d28..f2f7c897f6 100644
--- a/jscomp/test/dist/jscomp/test/bs_min_max_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_min_max_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_mutable_set_test.js b/jscomp/test/dist/jscomp/test/bs_mutable_set_test.js
index cd1aa0cc11..cb3b3de319 100644
--- a/jscomp/test/dist/jscomp/test/bs_mutable_set_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_mutable_set_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml_array = require("melange.js/caml_array.js");
 var Array_data_util = require("./array_data_util.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
-var Belt__Belt_Range = require("melange.belt/belt_Range.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_MutableSetInt = require("melange.belt/belt_MutableSetInt.js");
+var Belt__Belt_Range = require("melange.belt/belt_Range.js");
 var Belt__Belt_internalAVLset = require("melange.belt/belt_internalAVLset.js");
 var Belt__Belt_internalSetInt = require("melange.belt/belt_internalSetInt.js");
+var Caml_array = require("melange.js/caml_array.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 85c303d208..5682796c84 100644
--- a/jscomp/test/dist/jscomp/test/bs_poly_map_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_poly_map_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Caml_option = require("melange.js/caml_option.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
-var Belt__Belt_Map = require("melange.belt/belt_Map.js");
-var Belt__Belt_Set = require("melange.belt/belt_Set.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
+var Belt__Belt_Map = require("melange.belt/belt_Map.js");
 var Belt__Belt_MapDict = require("melange.belt/belt_MapDict.js");
+var Belt__Belt_Set = require("melange.belt/belt_Set.js");
+var Caml = require("melange.js/caml.js");
+var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 a4ff788d16..99dfdd2ebd 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
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
-var Belt__Belt_Set = require("melange.belt/belt_Set.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
 var Belt__Belt_MutableMap = require("melange.belt/belt_MutableMap.js");
+var Belt__Belt_Set = require("melange.belt/belt_Set.js");
 var Belt__Belt_internalAVLtree = require("melange.belt/belt_internalAVLtree.js");
+var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 d58a558ad1..dd55caa311 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
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
 var Array_data_util = require("./array_data_util.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_MutableSet = require("melange.belt/belt_MutableSet.js");
 var Belt__Belt_internalAVLset = require("melange.belt/belt_internalAVLset.js");
+var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_poly_set_test.js b/jscomp/test/dist/jscomp/test/bs_poly_set_test.js
index 6eb7eccd94..93d6dcccaa 100644
--- a/jscomp/test/dist/jscomp/test/bs_poly_set_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_poly_set_test.js
@@ -1,16 +1,16 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Belt__Belt_Id = require("melange.belt/belt_Id.js");
-var Belt__Belt_Set = require("melange.belt/belt_Set.js");
 var Array_data_util = require("./array_data_util.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_Id = require("melange.belt/belt_Id.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
+var Belt__Belt_Set = require("melange.belt/belt_Set.js");
 var Belt__Belt_SetDict = require("melange.belt/belt_SetDict.js");
 var Belt__Belt_SortArray = require("melange.belt/belt_SortArray.js");
+var Caml = require("melange.js/caml.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_qualified.js b/jscomp/test/dist/jscomp/test/bs_qualified.js
index 91e3b775f5..16695b4b61 100644
--- a/jscomp/test/dist/jscomp/test/bs_qualified.js
+++ b/jscomp/test/dist/jscomp/test/bs_qualified.js
@@ -2,9 +2,9 @@
 'use strict';
 
 var ZZ = require("X");
-var Z = require("z");
-var Vscode = require("vscode");
 var GlMatrix = require("gl-matrix");
+var Vscode = require("vscode");
+var Z = require("z");
 
 function f(a, b, c) {
   Vscode.commands.executeCommands("hi", a, b, c);
diff --git a/jscomp/test/dist/jscomp/test/bs_queue_test.js b/jscomp/test/dist/jscomp/test/bs_queue_test.js
index 2780ab2e80..765fa23d1f 100644
--- a/jscomp/test/dist/jscomp/test/bs_queue_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_queue_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_MutableQueue = require("melange.belt/belt_MutableQueue.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
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 bc1ab75e50..00064b9f41 100644
--- a/jscomp/test/dist/jscomp/test/bs_set_int_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_set_int_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Array = require("melange/array.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_SetInt = require("melange.belt/belt_SetInt.js");
+var Mt = require("./mt.js");
+var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_sort_test.js b/jscomp/test/dist/jscomp/test/bs_sort_test.js
index c40d1faeb4..3d92e3726b 100644
--- a/jscomp/test/dist/jscomp/test/bs_sort_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_sort_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml = require("melange.js/caml.js");
 var Array_data_util = require("./array_data_util.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_Range = require("melange.belt/belt_Range.js");
 var Belt__Belt_SortArray = require("melange.belt/belt_SortArray.js");
 var Belt__Belt_SortArrayInt = require("melange.belt/belt_SortArrayInt.js");
+var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_stack_test.js b/jscomp/test/dist/jscomp/test/bs_stack_test.js
index 903ba7fa1a..1e12bff963 100644
--- a/jscomp/test/dist/jscomp/test/bs_stack_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_stack_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Js__Js_undefined = require("melange.js/js_undefined.js");
 var Belt__Belt_MutableQueue = require("melange.belt/belt_MutableQueue.js");
 var Belt__Belt_MutableStack = require("melange.belt/belt_MutableStack.js");
+var Js__Js_undefined = require("melange.js/js_undefined.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/bs_unwrap_test.js b/jscomp/test/dist/jscomp/test/bs_unwrap_test.js
index f7f11a8ba3..0d81a43d6d 100644
--- a/jscomp/test/dist/jscomp/test/bs_unwrap_test.js
+++ b/jscomp/test/dist/jscomp/test/bs_unwrap_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
 
 console.log([
       "hello world",
diff --git a/jscomp/test/dist/jscomp/test/buffer_test.js b/jscomp/test/dist/jscomp/test/buffer_test.js
index 266ed91cf3..a2e3d34a7a 100644
--- a/jscomp/test/dist/jscomp/test/buffer_test.js
+++ b/jscomp/test/dist/jscomp/test/buffer_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Bytes = require("melange/bytes.js");
+var Mt = require("./mt.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
 
 var v = "gso";
 
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 be68a6006b..bb7cbd2f26 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
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Mt = require("./mt.js");
 var Stdlib__Bytes = require("melange/bytes.js");
 
 var suites = {
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 ff2579b2c8..95f8ac80e9 100644
--- a/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_compare_bigint_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_obj = require("melange.js/caml_obj.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 
 function isLessThan(title, small, big) {
   return {
diff --git a/jscomp/test/dist/jscomp/test/caml_compare_test.js b/jscomp/test/dist/jscomp/test/caml_compare_test.js
index a5ec5a9d5c..4e4ab1dae1 100644
--- a/jscomp/test/dist/jscomp/test/caml_compare_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_compare_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var function_equal_test;
 
diff --git a/jscomp/test/dist/jscomp/test/caml_format_test.js b/jscomp/test/dist/jscomp/test/caml_format_test.js
index fcd22593ef..b8fcbceb96 100644
--- a/jscomp/test/dist/jscomp/test/caml_format_test.js
+++ b/jscomp/test/dist/jscomp/test/caml_format_test.js
@@ -1,17 +1,17 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
-var Caml_format = require("melange.js/caml_format.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Int64 = require("melange/int64.js");
 var Stdlib__Buffer = require("melange/buffer.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__Int64 = require("melange/int64.js");
 var Stdlib__Printf = require("melange/printf.js");
-var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
 
 var of_string = [
   [
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 b709504741..97e8554c5a 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
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_sys = require("melange.js/caml_sys.js");
 var Mt = require("./mt.js");
+var Node__Node_process = require("melange.node/node_process.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Stdlib__Sys = require("melange/sys.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Node__Node_process = require("melange.node/node_process.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/chn_test.js b/jscomp/test/dist/jscomp/test/chn_test.js
index 86f244714f..a7b99b0cdf 100644
--- a/jscomp/test/dist/jscomp/test/chn_test.js
+++ b/jscomp/test/dist/jscomp/test/chn_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/class3_test.js b/jscomp/test/dist/jscomp/test/class3_test.js
index c228c58416..cc1cb488a0 100644
--- a/jscomp/test/dist/jscomp/test/class3_test.js
+++ b/jscomp/test/dist/jscomp/test/class3_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_array = require("melange.js/caml_array.js");
-var Stdlib__List = require("melange/list.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__List = require("melange/list.js");
 
 var shared = [
   "move",
diff --git a/jscomp/test/dist/jscomp/test/class4_test.js b/jscomp/test/dist/jscomp/test/class4_test.js
index a40b248f7e..2fc16158e0 100644
--- a/jscomp/test/dist/jscomp/test/class4_test.js
+++ b/jscomp/test/dist/jscomp/test/class4_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = [
   "bump",
diff --git a/jscomp/test/dist/jscomp/test/class5_test.js b/jscomp/test/dist/jscomp/test/class5_test.js
index c8871e7669..5486a87adc 100644
--- a/jscomp/test/dist/jscomp/test/class5_test.js
+++ b/jscomp/test/dist/jscomp/test/class5_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Stdlib__List = require("melange/list.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__List = require("melange/list.js");
 
 var shared = [
   "move",
diff --git a/jscomp/test/dist/jscomp/test/class6_test.js b/jscomp/test/dist/jscomp/test/class6_test.js
index fe2f37c39f..c08238cabf 100644
--- a/jscomp/test/dist/jscomp/test/class6_test.js
+++ b/jscomp/test/dist/jscomp/test/class6_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 var shared = [
   "move",
diff --git a/jscomp/test/dist/jscomp/test/class7_test.js b/jscomp/test/dist/jscomp/test/class7_test.js
index 47ad833018..59ab47f61e 100644
--- a/jscomp/test/dist/jscomp/test/class7_test.js
+++ b/jscomp/test/dist/jscomp/test/class7_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_option = require("melange.js/caml_option.js");
+var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
+var Caml_option = require("melange.js/caml_option.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = ["copy"];
 
diff --git a/jscomp/test/dist/jscomp/test/class8_test.js b/jscomp/test/dist/jscomp/test/class8_test.js
index deea1e94df..4585e99cd5 100644
--- a/jscomp/test/dist/jscomp/test/class8_test.js
+++ b/jscomp/test/dist/jscomp/test/class8_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = ["repr"];
 
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 3e4d613ccc..919e98496e 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
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var shared = ["calc"];
 
diff --git a/jscomp/test/dist/jscomp/test/class_repr.js b/jscomp/test/dist/jscomp/test/class_repr.js
index 1ab92d3b13..a860101ad6 100644
--- a/jscomp/test/dist/jscomp/test/class_repr.js
+++ b/jscomp/test/dist/jscomp/test/class_repr.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Stdlib__Sys = require("melange/sys.js");
+var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib__Sys = require("melange/sys.js");
 
 var shared = ["get_x"];
 
diff --git a/jscomp/test/dist/jscomp/test/class_test.js b/jscomp/test/dist/jscomp/test/class_test.js
index 87eedf923e..a979412ec6 100644
--- a/jscomp/test/dist/jscomp/test/class_test.js
+++ b/jscomp/test/dist/jscomp/test/class_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = [
   "move",
diff --git a/jscomp/test/dist/jscomp/test/complex_if_test.js b/jscomp/test/dist/jscomp/test/complex_if_test.js
index 0ab0b3768d..32bb7829e3 100644
--- a/jscomp/test/dist/jscomp/test/complex_if_test.js
+++ b/jscomp/test/dist/jscomp/test/complex_if_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Mt = require("./mt.js");
 var Stdlib__Bytes = require("melange/bytes.js");
 
 function fib(n) {
diff --git a/jscomp/test/dist/jscomp/test/const_block_test.js b/jscomp/test/dist/jscomp/test/const_block_test.js
index 3c18404d28..68a2206a0c 100644
--- a/jscomp/test/dist/jscomp/test/const_block_test.js
+++ b/jscomp/test/dist/jscomp/test/const_block_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Mt = require("./mt.js");
 
 var a = [
   0,
diff --git a/jscomp/test/dist/jscomp/test/cps_test.js b/jscomp/test/dist/jscomp/test/cps_test.js
index 9a26e5b278..2ab099b2e3 100644
--- a/jscomp/test/dist/jscomp/test/cps_test.js
+++ b/jscomp/test/dist/jscomp/test/cps_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 
 function test(param) {
diff --git a/jscomp/test/dist/jscomp/test/custom_error_test.js b/jscomp/test/dist/jscomp/test/custom_error_test.js
index 7c7627bcc1..2097e00495 100644
--- a/jscomp/test/dist/jscomp/test/custom_error_test.js
+++ b/jscomp/test/dist/jscomp/test/custom_error_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Js__Js_exn = require("melange.js/js_exn.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_option = require("melange.js/caml_option.js");
+var Js__Js_exn = require("melange.js/js_exn.js");
 
 function test_js_error(param) {
   var e;
diff --git a/jscomp/test/dist/jscomp/test/demo.js b/jscomp/test/dist/jscomp/test/demo.js
index ca1e5ee622..42f8263839 100644
--- a/jscomp/test/dist/jscomp/test/demo.js
+++ b/jscomp/test/dist/jscomp/test/demo.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var UI = require("@ui");
-var Curry = require("melange.js/curry.js");
 var BUI = require("@blp/ui");
 var Runtime = require("@runtime");
+var UI = require("@ui");
+var Curry = require("melange.js/curry.js");
 
 var data = [
   {
@@ -126,4 +126,4 @@ function ui_layout(compile, lookup, appContext) {
 
 exports.data = data;
 exports.ui_layout = ui_layout;
-/* @ui Not a pure module */
+/* @blp/ui Not a pure module */
diff --git a/jscomp/test/dist/jscomp/test/digest_test.js b/jscomp/test/dist/jscomp/test/digest_test.js
index 3a445fc96d..17b254bd23 100644
--- a/jscomp/test/dist/jscomp/test/digest_test.js
+++ b/jscomp/test/dist/jscomp/test/digest_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Curry = require("melange.js/curry.js");
+var Ext_array_test = require("./ext_array_test.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Bytes = require("melange/bytes.js");
-var Ext_array_test = require("./ext_array_test.js");
 var Stdlib__Digest = require("melange/digest.js");
 var Stdlib__Printf = require("melange/printf.js");
 
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 25824855d0..6f60e74d4f 100644
--- a/jscomp/test/dist/jscomp/test/div_by_zero_test.js
+++ b/jscomp/test/dist/jscomp/test/div_by_zero_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/earger_curry_test.js b/jscomp/test/dist/jscomp/test/earger_curry_test.js
index ef4aab03f1..3af1f07d49 100644
--- a/jscomp/test/dist/jscomp/test/earger_curry_test.js
+++ b/jscomp/test/dist/jscomp/test/earger_curry_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_array = require("melange.js/caml_array.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_array = require("melange.js/caml_array.js");
 
 function map(f, a) {
   var f$1 = Curry.__1(f);
diff --git a/jscomp/test/dist/jscomp/test/equal_box_test.js b/jscomp/test/dist/jscomp/test/equal_box_test.js
index 2c31d25610..b8ed6b3f5e 100644
--- a/jscomp/test/dist/jscomp/test/equal_box_test.js
+++ b/jscomp/test/dist/jscomp/test/equal_box_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var aa = Caml_obj.caml_equal_null;
 
diff --git a/jscomp/test/dist/jscomp/test/equal_exception_test.js b/jscomp/test/dist/jscomp/test/equal_exception_test.js
index 5e86f964c5..e3a796775a 100644
--- a/jscomp/test/dist/jscomp/test/equal_exception_test.js
+++ b/jscomp/test/dist/jscomp/test/equal_exception_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__Bytes = require("melange/bytes.js");
 
 var v = "gso";
 
diff --git a/jscomp/test/dist/jscomp/test/exception_def.js b/jscomp/test/dist/jscomp/test/exception_def.js
index 696edfbc3a..32da3ab392 100644
--- a/jscomp/test/dist/jscomp/test/exception_def.js
+++ b/jscomp/test/dist/jscomp/test/exception_def.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib__Printexc = require("melange/printexc.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/exception_raise_test.js b/jscomp/test/dist/jscomp/test/exception_raise_test.js
index eb2c717da8..e9ee2dcd76 100644
--- a/jscomp/test/dist/jscomp/test/exception_raise_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_raise_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Js__Js_exn = require("melange.js/js_exn.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var Local = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.Local");
 
diff --git a/jscomp/test/dist/jscomp/test/exception_rebind_test.js b/jscomp/test/dist/jscomp/test/exception_rebind_test.js
index a7bedad18b..f09a85ea12 100644
--- a/jscomp/test/dist/jscomp/test/exception_rebind_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_rebind_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib = require("melange/stdlib.js");
-var Exception_def = require("./exception_def.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Exception_def = require("./exception_def.js");
+var Stdlib = require("melange/stdlib.js");
 
 var E = /* @__PURE__ */Caml_exceptions.create("Exception_rebind_test.A.E");
 
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 7a6b407975..358acc69bb 100644
--- a/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_rebound_err_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/exception_repr_test.js b/jscomp/test/dist/jscomp/test/exception_repr_test.js
index 8e3683562a..113d8abc40 100644
--- a/jscomp/test/dist/jscomp/test/exception_repr_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_repr_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Curry = require("melange.js/curry.js");
 var Exception_def = require("./exception_def.js");
+var Mt = require("./mt.js");
 var Stdlib__Format = require("melange/format.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib__Printexc = require("melange/printexc.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/exception_value_test.js b/jscomp/test/dist/jscomp/test/exception_value_test.js
index 4a16954011..1634ec8e94 100644
--- a/jscomp/test/dist/jscomp/test/exception_value_test.js
+++ b/jscomp/test/dist/jscomp/test/exception_value_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Js__Js_exn = require("melange.js/js_exn.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
+var Js__Js_exn = require("melange.js/js_exn.js");
+var Stdlib = require("melange/stdlib.js");
 
 function f(param) {
   throw {
diff --git a/jscomp/test/dist/jscomp/test/exn_error_pattern.js b/jscomp/test/dist/jscomp/test/exn_error_pattern.js
index 2800da90cf..3ae0347b16 100644
--- a/jscomp/test/dist/jscomp/test/exn_error_pattern.js
+++ b/jscomp/test/dist/jscomp/test/exn_error_pattern.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 function f(match) {
   if (Caml_exceptions.caml_is_extension(match)) {
diff --git a/jscomp/test/dist/jscomp/test/ext_array_test.js b/jscomp/test/dist/jscomp/test/ext_array_test.js
index 9e2fb1fe3d..e9e3ae621b 100644
--- a/jscomp/test/dist/jscomp/test/ext_array_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_array_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 function reverse_range(a, i, len) {
   if (len === 0) {
diff --git a/jscomp/test/dist/jscomp/test/ext_bytes_test.js b/jscomp/test/dist/jscomp/test/ext_bytes_test.js
index a889b7525a..42d1c5d2be 100644
--- a/jscomp/test/dist/jscomp/test/ext_bytes_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_bytes_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ext_filename_test.js b/jscomp/test/dist/jscomp/test/ext_filename_test.js
index 0c9579e857..0b37dc18b5 100644
--- a/jscomp/test/dist/jscomp/test/ext_filename_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_filename_test.js
@@ -1,22 +1,22 @@
 // Generated by Melange
 'use strict';
 
+var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_sys = require("melange.js/caml_sys.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
 var Curry = require("melange.js/curry.js");
+var Ext_pervasives_test = require("./ext_pervasives_test.js");
+var Ext_string_test = require("./ext_string_test.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_sys = require("melange.js/caml_sys.js");
-var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Bytes = require("melange/bytes.js");
-var Test_literals = require("./test_literals.js");
+var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
-var Ext_string_test = require("./ext_string_test.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Stdlib__Filename = require("melange/filename.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Ext_pervasives_test = require("./ext_pervasives_test.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Sys = require("melange/sys.js");
+var Test_literals = require("./test_literals.js");
 
 var node_sep = "/";
 
diff --git a/jscomp/test/dist/jscomp/test/ext_list_test.js b/jscomp/test/dist/jscomp/test/ext_list_test.js
index cdb9bf7c20..f31189f796 100644
--- a/jscomp/test/dist/jscomp/test/ext_list_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_list_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Array = require("melange/array.js");
+var Curry = require("melange.js/curry.js");
 var Ext_string_test = require("./ext_string_test.js");
+var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 function filter_map(f, _xs) {
   while(true) {
diff --git a/jscomp/test/dist/jscomp/test/ext_log_test.js b/jscomp/test/dist/jscomp/test/ext_log_test.js
index e3b6b986f5..f84fffc704 100644
--- a/jscomp/test/dist/jscomp/test/ext_log_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_log_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib__Format = require("melange/format.js");
-var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
 
 function $caret$caret(param, param$1) {
   return /* Format */{
diff --git a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
index 159e98615f..479740ed4e 100644
--- a/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_pervasives_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_string = require("melange.js/caml_string.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_string = require("melange.js/caml_string.js");
 var Stdlib__Arg = require("melange/arg.js");
 var Stdlib__Format = require("melange/format.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function $$finally(v, action, f) {
   var e;
diff --git a/jscomp/test/dist/jscomp/test/ext_string_test.js b/jscomp/test/dist/jscomp/test/ext_string_test.js
index e341d0bae9..66cb959734 100644
--- a/jscomp/test/dist/jscomp/test/ext_string_test.js
+++ b/jscomp/test/dist/jscomp/test/ext_string_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_string = require("melange.js/caml_string.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Bytes = require("melange/bytes.js");
+var Curry = require("melange.js/curry.js");
 var Ext_bytes_test = require("./ext_bytes_test.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function split_by(keep_emptyOpt, is_delim, str) {
   var keep_empty = keep_emptyOpt !== undefined ? keep_emptyOpt : false;
diff --git a/jscomp/test/dist/jscomp/test/extensible_variant_test.js b/jscomp/test/dist/jscomp/test/extensible_variant_test.js
index 244c294440..de23b34d23 100644
--- a/jscomp/test/dist/jscomp/test/extensible_variant_test.js
+++ b/jscomp/test/dist/jscomp/test/extensible_variant_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Mt = require("./mt.js");
 
 var Str = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Str");
 
diff --git a/jscomp/test/dist/jscomp/test/external_polyfill_test.js b/jscomp/test/dist/jscomp/test/external_polyfill_test.js
index ab8635eb89..288ba6cf2f 100644
--- a/jscomp/test/dist/jscomp/test/external_polyfill_test.js
+++ b/jscomp/test/dist/jscomp/test/external_polyfill_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ffi_arity_test.js b/jscomp/test/dist/jscomp/test/ffi_arity_test.js
index bc5bbaf988..eb0c491912 100644
--- a/jscomp/test/dist/jscomp/test/ffi_arity_test.js
+++ b/jscomp/test/dist/jscomp/test/ffi_arity_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 function f(v) {
   if (v % 2 === 0) {
diff --git a/jscomp/test/dist/jscomp/test/flexible_array_test.js b/jscomp/test/dist/jscomp/test/flexible_array_test.js
index 4cb6583b9a..3a77785c65 100644
--- a/jscomp/test/dist/jscomp/test/flexible_array_test.js
+++ b/jscomp/test/dist/jscomp/test/flexible_array_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
+var Caml_array = require("melange.js/caml_array.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_array = require("melange.js/caml_array.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Format = require("melange/format.js");
 
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 72bdce702d..cf52bdbc45 100644
--- a/jscomp/test/dist/jscomp/test/float_of_bits_test.js
+++ b/jscomp/test/dist/jscomp/test/float_of_bits_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_float = require("melange.js/caml_float.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
 
 var one_float = [
diff --git a/jscomp/test/dist/jscomp/test/float_test.js b/jscomp/test/dist/jscomp/test/float_test.js
index 113a7196bc..3a8393c002 100644
--- a/jscomp/test/dist/jscomp/test/float_test.js
+++ b/jscomp/test/dist/jscomp/test/float_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Mt_global = require("./mt_global.js");
 var Caml_float = require("melange.js/caml_float.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Mt_global = require("./mt_global.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Printf = require("melange/printf.js");
 
diff --git a/jscomp/test/dist/jscomp/test/floatarray_test.js b/jscomp/test/dist/jscomp/test/floatarray_test.js
index 6c798ed2c6..cb81de917a 100644
--- a/jscomp/test/dist/jscomp/test/floatarray_test.js
+++ b/jscomp/test/dist/jscomp/test/floatarray_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */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 9f20eff6af..44b7719db8 100644
--- a/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
+++ b/jscomp/test/dist/jscomp/test/flow_parser_reg_test.js
@@ -1,31 +1,31 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Fs = require("fs");
 var Caml = require("melange.js/caml.js");
-var Path = require("path");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_module = require("melange.js/caml_module.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Queue = require("melange/queue.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Char = require("melange/char.js");
+var Stdlib__Filename = require("melange/filename.js");
+var Stdlib__Hashtbl = require("melange/hashtbl.js");
 var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__Queue = require("melange/queue.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Stdlib__Filename = require("melange/filename.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib__Sys = require("melange/sys.js");
+var Fs = require("fs");
+var Path = require("path");
 
 var none = {
   source: undefined,
diff --git a/jscomp/test/dist/jscomp/test/for_loop_test.js b/jscomp/test/dist/jscomp/test/for_loop_test.js
index 1ffa6e9227..baf6667e03 100644
--- a/jscomp/test/dist/jscomp/test/for_loop_test.js
+++ b/jscomp/test/dist/jscomp/test/for_loop_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 function for_3(x) {
   var v = {
diff --git a/jscomp/test/dist/jscomp/test/format_test.js b/jscomp/test/dist/jscomp/test/format_test.js
index 64e5b2d859..f7afa77801 100644
--- a/jscomp/test/dist/jscomp/test/format_test.js
+++ b/jscomp/test/dist/jscomp/test/format_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_format = require("melange.js/caml_format.js");
+var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_format = require("melange.js/caml_format.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Scanf = require("melange/scanf.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
-var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
+var Stdlib__Scanf = require("melange/scanf.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/functor_app_test.js b/jscomp/test/dist/jscomp/test/functor_app_test.js
index 7a7216cf03..d5feb1520a 100644
--- a/jscomp/test/dist/jscomp/test/functor_app_test.js
+++ b/jscomp/test/dist/jscomp/test/functor_app_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
 var Functor_def = require("./functor_def.js");
 var Functor_inst = require("./functor_inst.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/genlex_test.js b/jscomp/test/dist/jscomp/test/genlex_test.js
index df12618021..7c0894a896 100644
--- a/jscomp/test/dist/jscomp/test/genlex_test.js
+++ b/jscomp/test/dist/jscomp/test/genlex_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Mt = require("./mt.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Genlex = require("melange/genlex.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Stream = require("melange/stream.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var lexer = Stdlib__Genlex.make_lexer({
       hd: "+",
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 aae0d57a3a..d4e94aeeed 100644
--- a/jscomp/test/dist/jscomp/test/global_module_alias_test.js
+++ b/jscomp/test/dist/jscomp/test/global_module_alias_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/gpr496_test.js b/jscomp/test/dist/jscomp/test/gpr496_test.js
index c1d70032a2..886a81b89b 100644
--- a/jscomp/test/dist/jscomp/test/gpr496_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr496_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1154_test.js b/jscomp/test/dist/jscomp/test/gpr_1154_test.js
index 1ba8a16678..a1e8346ecf 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1154_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1154_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_int64 = require("melange.js/caml_int64.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
 var Stdlib__Int64 = require("melange/int64.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/gpr_1245_test.js b/jscomp/test/dist/jscomp/test/gpr_1245_test.js
index 129541d1b6..b2e964f2b2 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1245_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1245_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
 
 var x = {
   contents: 1
diff --git a/jscomp/test/dist/jscomp/test/gpr_1285_test.js b/jscomp/test/dist/jscomp/test/gpr_1285_test.js
index 3fadf779f8..8f849e01fa 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1285_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1285_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1409_test.js b/jscomp/test/dist/jscomp/test/gpr_1409_test.js
index 96bc6e5f26..a5553da359 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1409_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1409_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var String_set = require("./string_set.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
+var String_set = require("./string_set.js");
 
 var suites = {
   contents: /* [] */0
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 282b6e287c..29a637e2ab 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1423_app_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1423_app_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
 var Gpr_1423_nav = require("./gpr_1423_nav.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1501_test.js b/jscomp/test/dist/jscomp/test/gpr_1501_test.js
index a948b72eab..12770d50c6 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1501_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1501_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib__Printexc = require("melange/printexc.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/gpr_1503_test.js b/jscomp/test/dist/jscomp/test/gpr_1503_test.js
index 371b820a8c..868c8667a9 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1503_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1503_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Mt = require("./mt.js");
 var Stdlib__Int64 = require("melange/int64.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/gpr_1658_test.js b/jscomp/test/dist/jscomp/test/gpr_1658_test.js
index c4c28bd067..0d1c9d78bc 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1658_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1658_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_types = require("melange.js/js_types.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1701_test.js b/jscomp/test/dist/jscomp/test/gpr_1701_test.js
index ab26cdac6f..436a8a7e80 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1701_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1701_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib = require("melange/stdlib.js");
-var Stdlib__List = require("melange/list.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__List = require("melange/list.js");
 
 var Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo");
 
diff --git a/jscomp/test/dist/jscomp/test/gpr_1716_test.js b/jscomp/test/dist/jscomp/test/gpr_1716_test.js
index dfa696f4b2..6ce6a33713 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1716_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1716_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1728_test.js b/jscomp/test/dist/jscomp/test/gpr_1728_test.js
index b03b7ebaa7..a3373742f1 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1728_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1728_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1760_test.js b/jscomp/test/dist/jscomp/test/gpr_1760_test.js
index 35b17b11d4..cf52a673ca 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1760_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1760_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_1817_test.js b/jscomp/test/dist/jscomp/test/gpr_1817_test.js
index 6ecc9a6d81..b2858a5001 100644
--- a/jscomp/test/dist/jscomp/test/gpr_1817_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_1817_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_2250_test.js b/jscomp/test/dist/jscomp/test/gpr_2250_test.js
index 4157327686..55d02437c2 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2250_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2250_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_2316_test.js b/jscomp/test/dist/jscomp/test/gpr_2316_test.js
index 14ffd91823..aaf9c8fcd9 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2316_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2316_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_2503_test.js b/jscomp/test/dist/jscomp/test/gpr_2503_test.js
index 1396776001..42891e8691 100644
--- a/jscomp/test/dist/jscomp/test/gpr_2503_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_2503_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_3154_test.js b/jscomp/test/dist/jscomp/test/gpr_3154_test.js
index a19d9160f4..a02d18367c 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3154_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3154_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_dict = require("melange.js/js_dict.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_3536_test.js b/jscomp/test/dist/jscomp/test/gpr_3536_test.js
index cdd9df8678..2c8fad6bfb 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3536_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3536_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_3566_drive_test.js b/jscomp/test/dist/jscomp/test/gpr_3566_drive_test.js
index cbcb956a2e..3be25191ce 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3566_drive_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3566_drive_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Gpr_3566_test = require("./gpr_3566_test.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_3566_test.js b/jscomp/test/dist/jscomp/test/gpr_3566_test.js
index 40c43ae895..b6aabe510d 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3566_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3566_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
 
 function eq_A(x, y) {
   if (x.TAG === /* A */0 && y.TAG === /* A */0) {
diff --git a/jscomp/test/dist/jscomp/test/gpr_3875_test.js b/jscomp/test/dist/jscomp/test/gpr_3875_test.js
index 5d65e868d5..0d2b7a44ba 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3875_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3875_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var result = {
   contents: ""
diff --git a/jscomp/test/dist/jscomp/test/gpr_3931_test.js b/jscomp/test/dist/jscomp/test/gpr_3931_test.js
index 8f3d26be01..8be0b76574 100644
--- a/jscomp/test/dist/jscomp/test/gpr_3931_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_3931_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_module = require("melange.js/caml_module.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
 
 var PA = Caml_module.init_mod([
diff --git a/jscomp/test/dist/jscomp/test/gpr_405_test.js b/jscomp/test/dist/jscomp/test/gpr_405_test.js
index fd9bc34f6d..eccf41af97 100644
--- a/jscomp/test/dist/jscomp/test/gpr_405_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_405_test.js
@@ -2,10 +2,10 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function Make(funarg) {
   var $$let = funarg.V;
diff --git a/jscomp/test/dist/jscomp/test/gpr_4265_test.js b/jscomp/test/dist/jscomp/test/gpr_4265_test.js
index e48fc3af71..796f9d6638 100644
--- a/jscomp/test/dist/jscomp/test/gpr_4265_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_4265_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Belt__Belt_MutableMapInt = require("melange.belt/belt_MutableMapInt.js");
 var Belt__Belt_internalMapInt = require("melange.belt/belt_internalMapInt.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/gpr_4274_test.js b/jscomp/test/dist/jscomp/test/gpr_4274_test.js
index d5195bad4c..69a60f6de4 100644
--- a/jscomp/test/dist/jscomp/test/gpr_4274_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_4274_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 
 var N = {};
 
diff --git a/jscomp/test/dist/jscomp/test/gpr_4407_test.js b/jscomp/test/dist/jscomp/test/gpr_4407_test.js
index 979e8774d3..0b72c8d1ba 100644
--- a/jscomp/test/dist/jscomp/test/gpr_4407_test.js
+++ b/jscomp/test/dist/jscomp/test/gpr_4407_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Debug_mode_value = require("./debug_mode_value.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/hamming_test.js b/jscomp/test/dist/jscomp/test/hamming_test.js
index 730c4b978c..aca5b84c9e 100644
--- a/jscomp/test/dist/jscomp/test/hamming_test.js
+++ b/jscomp/test/dist/jscomp/test/hamming_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Buffer = require("melange/buffer.js");
 var Stdlib__Printf = require("melange/printf.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
 
 var n0 = Caml_int64.zero;
 
diff --git a/jscomp/test/dist/jscomp/test/hash_sugar_desugar.js b/jscomp/test/dist/jscomp/test/hash_sugar_desugar.js
index 56daf89042..513bf22ead 100644
--- a/jscomp/test/dist/jscomp/test/hash_sugar_desugar.js
+++ b/jscomp/test/dist/jscomp/test/hash_sugar_desugar.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
+var Curry = require("melange.js/curry.js");
 
 function h1(u) {
   return u.p;
diff --git a/jscomp/test/dist/jscomp/test/hash_test.js b/jscomp/test/dist/jscomp/test/hash_test.js
index 82ca334856..8ce3d165b2 100644
--- a/jscomp/test/dist/jscomp/test/hash_test.js
+++ b/jscomp/test/dist/jscomp/test/hash_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
+var Caml_bytes = require("melange.js/caml_bytes.js");
 var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
-var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Char = require("melange/char.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/hashtbl_test.js b/jscomp/test/dist/jscomp/test/hashtbl_test.js
index 310bc4c08b..51dbc3e17a 100644
--- a/jscomp/test/dist/jscomp/test/hashtbl_test.js
+++ b/jscomp/test/dist/jscomp/test/hashtbl_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
 var Curry = require("melange.js/curry.js");
-var Stdlib__List = require("melange/list.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__MoreLabels = require("melange/moreLabels.js");
 
 function to_list(tbl) {
diff --git a/jscomp/test/dist/jscomp/test/if_used_test.js b/jscomp/test/dist/jscomp/test/if_used_test.js
index ebbd61fcce..19dc902641 100644
--- a/jscomp/test/dist/jscomp/test/if_used_test.js
+++ b/jscomp/test/dist/jscomp/test/if_used_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
 
 var shared = [
   "move",
diff --git a/jscomp/test/dist/jscomp/test/imm_map_bench.js b/jscomp/test/dist/jscomp/test/imm_map_bench.js
index 0a6f4792ee..71451ee5bb 100644
--- a/jscomp/test/dist/jscomp/test/imm_map_bench.js
+++ b/jscomp/test/dist/jscomp/test/imm_map_bench.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Immutable = require("immutable");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_MapInt = require("melange.belt/belt_MapInt.js");
+var Immutable = require("immutable");
 
 var empty = new Immutable.OrderedMap();
 
diff --git a/jscomp/test/dist/jscomp/test/inline_const_test.js b/jscomp/test/dist/jscomp/test/inline_const_test.js
index 41e0ea3c76..fea649d753 100644
--- a/jscomp/test/dist/jscomp/test/inline_const_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_const_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
 var Inline_const = require("./inline_const.js");
+var Mt = require("./mt.js");
 var Stdlib__Int64 = require("melange/int64.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/inline_map2_test.js b/jscomp/test/dist/jscomp/test/inline_map2_test.js
index 9c78a4b43a..6ea52a4ef9 100644
--- a/jscomp/test/dist/jscomp/test/inline_map2_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_map2_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
+var Caml_option = require("melange.js/caml_option.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Stdlib__List = require("melange/list.js");
 
 function Make(Ord) {
diff --git a/jscomp/test/dist/jscomp/test/inline_map_test.js b/jscomp/test/dist/jscomp/test/inline_map_test.js
index 5ee34d963e..31f16b0b4a 100644
--- a/jscomp/test/dist/jscomp/test/inline_map_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_map_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 
diff --git a/jscomp/test/dist/jscomp/test/inline_record_test.js b/jscomp/test/dist/jscomp/test/inline_record_test.js
index 182bc9d951..a0d527a37d 100644
--- a/jscomp/test/dist/jscomp/test/inline_record_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_record_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/inline_regression_test.js b/jscomp/test/dist/jscomp/test/inline_regression_test.js
index cde00674d9..f48923afb7 100644
--- a/jscomp/test/dist/jscomp/test/inline_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/inline_regression_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_string = require("melange.js/caml_string.js");
-var Stdlib__String = require("melange/string.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Filename = require("melange/filename.js");
+var Stdlib__String = require("melange/string.js");
 
 function generic_basename(is_dir_sep, current_dir_name, name) {
   if (name === "") {
diff --git a/jscomp/test/dist/jscomp/test/int32_test.js b/jscomp/test/dist/jscomp/test/int32_test.js
index f03ffd3889..d20c95586c 100644
--- a/jscomp/test/dist/jscomp/test/int32_test.js
+++ b/jscomp/test/dist/jscomp/test/int32_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_float = require("melange.js/caml_float.js");
 var Curry = require("melange.js/curry.js");
+var Ext_array_test = require("./ext_array_test.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_float = require("melange.js/caml_float.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Int32 = require("melange/int32.js");
-var Ext_array_test = require("./ext_array_test.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__Int32 = require("melange/int32.js");
 
 function f(x) {
   return [
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 156ab3b69d..834cb5c352 100644
--- a/jscomp/test/dist/jscomp/test/int64_mul_div_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_mul_div_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
-var Caml_format = require("melange.js/caml_format.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Int64 = require("melange/int64.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
 
 function commutative_mul(result, a, b) {
diff --git a/jscomp/test/dist/jscomp/test/int64_string_bench.js b/jscomp/test/dist/jscomp/test/int64_string_bench.js
index 241043559b..cfa0ba93e0 100644
--- a/jscomp/test/dist/jscomp/test/int64_string_bench.js
+++ b/jscomp/test/dist/jscomp/test/int64_string_bench.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Caml_int64 = require("melange.js/caml_int64.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
 var Stdlib__Int64 = require("melange/int64.js");
 
 console.time("Int64.to_string");
diff --git a/jscomp/test/dist/jscomp/test/int64_string_test.js b/jscomp/test/dist/jscomp/test/int64_string_test.js
index c34df7bd4a..b7787cd92c 100644
--- a/jscomp/test/dist/jscomp/test/int64_string_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_string_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Mt = require("./mt.js");
 var Stdlib__Int64 = require("melange/int64.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/int64_test.js b/jscomp/test/dist/jscomp/test/int64_test.js
index b95a5f6fce..e4c97fbee4 100644
--- a/jscomp/test/dist/jscomp/test/int64_test.js
+++ b/jscomp/test/dist/jscomp/test/int64_test.js
@@ -1,18 +1,18 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Curry = require("melange.js/curry.js");
+var Ext_array_test = require("./ext_array_test.js");
+var Js__Caml_int64 = require("melange.js/caml_int64.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
-var Caml_format = require("melange.js/caml_format.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__Format = require("melange/format.js");
 var Stdlib__Int32 = require("melange/int32.js");
 var Stdlib__Int64 = require("melange/int64.js");
-var Ext_array_test = require("./ext_array_test.js");
-var Js__Caml_int64 = require("melange.js/caml_int64.js");
-var Stdlib__Format = require("melange/format.js");
 
 function f(u, v) {
   return u > v;
diff --git a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js b/jscomp/test/dist/jscomp/test/int_hashtbl_test.js
index f0f20046df..87a8972003 100644
--- a/jscomp/test/dist/jscomp/test/int_hashtbl_test.js
+++ b/jscomp/test/dist/jscomp/test/int_hashtbl_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
 var Curry = require("melange.js/curry.js");
-var Stdlib__List = require("melange/list.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
+var Stdlib__List = require("melange/list.js");
 
 function f(H) {
   var tbl = Curry._1(H.create, 17);
diff --git a/jscomp/test/dist/jscomp/test/int_map.js b/jscomp/test/dist/jscomp/test/int_map.js
index 810f8c06e0..ca034c9369 100644
--- a/jscomp/test/dist/jscomp/test/int_map.js
+++ b/jscomp/test/dist/jscomp/test/int_map.js
@@ -2,9 +2,9 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
+var Caml_option = require("melange.js/caml_option.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Stdlib__Seq = require("melange/seq.js");
 
 var compare = Caml.caml_int_compare;
diff --git a/jscomp/test/dist/jscomp/test/int_overflow_test.js b/jscomp/test/dist/jscomp/test/int_overflow_test.js
index ceaa65e782..fab2cfc02a 100644
--- a/jscomp/test/dist/jscomp/test/int_overflow_test.js
+++ b/jscomp/test/dist/jscomp/test/int_overflow_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Mt = require("./mt.js");
 var Stdlib__Int32 = require("melange/int32.js");
 
 function hash_variant(s) {
diff --git a/jscomp/test/dist/jscomp/test/int_switch_test.js b/jscomp/test/dist/jscomp/test/int_switch_test.js
index 25c4fdd28a..98837e1cbb 100644
--- a/jscomp/test/dist/jscomp/test/int_switch_test.js
+++ b/jscomp/test/dist/jscomp/test/int_switch_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_array_test.js b/jscomp/test/dist/jscomp/test/js_array_test.js
index fc782a5168..1f4394f0f6 100644
--- a/jscomp/test/dist/jscomp/test/js_array_test.js
+++ b/jscomp/test/dist/jscomp/test/js_array_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_vector = require("melange.js/js_vector.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "File \"js_array_test.ml\", line 3, characters 4-11",
diff --git a/jscomp/test/dist/jscomp/test/js_date_test.js b/jscomp/test/dist/jscomp/test/js_date_test.js
index f95e4579c2..c39b8cb1d0 100644
--- a/jscomp/test/dist/jscomp/test/js_date_test.js
+++ b/jscomp/test/dist/jscomp/test/js_date_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 function date(param) {
   return new Date("1976-03-08T12:34:56.789+01:23");
diff --git a/jscomp/test/dist/jscomp/test/js_dict_test.js b/jscomp/test/dist/jscomp/test/js_dict_test.js
index 56cd8abe42..7c5caf894a 100644
--- a/jscomp/test/dist/jscomp/test/js_dict_test.js
+++ b/jscomp/test/dist/jscomp/test/js_dict_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_dict = require("melange.js/js_dict.js");
+var Mt = require("./mt.js");
 
 function obj(param) {
   return {
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 ee6306f42d..fc3a6ec06f 100644
--- a/jscomp/test/dist/jscomp/test/js_exception_catch_test.js
+++ b/jscomp/test/dist/jscomp/test/js_exception_catch_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Js__Js_exn = require("melange.js/js_exn.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
+var Js__Js_exn = require("melange.js/js_exn.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_json_test.js b/jscomp/test/dist/jscomp/test/js_json_test.js
index 1b7a80196d..bd25488d2f 100644
--- a/jscomp/test/dist/jscomp/test/js_json_test.js
+++ b/jscomp/test/dist/jscomp/test/js_json_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_dict = require("melange.js/js_dict.js");
 var Js__Js_json = require("melange.js/js_json.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
-var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_list_test.js b/jscomp/test/dist/jscomp/test/js_list_test.js
index c34f96d0f7..969a354c94 100644
--- a/jscomp/test/dist/jscomp/test/js_list_test.js
+++ b/jscomp/test/dist/jscomp/test/js_list_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_list = require("melange.js/js_list.js");
 var Js__Js_vector = require("melange.js/js_vector.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_math_test.js b/jscomp/test/dist/jscomp/test/js_math_test.js
index 69c0c6a409..90d640acf8 100644
--- a/jscomp/test/dist/jscomp/test/js_math_test.js
+++ b/jscomp/test/dist/jscomp/test/js_math_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_math = require("melange.js/js_math.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "_E",
diff --git a/jscomp/test/dist/jscomp/test/js_null_test.js b/jscomp/test/dist/jscomp/test/js_null_test.js
index f148f7f47b..bec0e180c8 100644
--- a/jscomp/test/dist/jscomp/test/js_null_test.js
+++ b/jscomp/test/dist/jscomp/test/js_null_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_null = require("melange.js/js_null.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "toOption - empty",
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 997d66e0b3..a98b4cfe04 100644
--- a/jscomp/test/dist/jscomp/test/js_null_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/js_null_undefined_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_null_undefined = require("melange.js/js_null_undefined.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "toOption - null",
diff --git a/jscomp/test/dist/jscomp/test/js_obj_test.js b/jscomp/test/dist/jscomp/test/js_obj_test.js
index b58d6b92a6..46209fa335 100644
--- a/jscomp/test/dist/jscomp/test/js_obj_test.js
+++ b/jscomp/test/dist/jscomp/test/js_obj_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 function f(u) {
   return Caml_oo_curry.js2(5740587, 1, u, 32);
diff --git a/jscomp/test/dist/jscomp/test/js_option_test.js b/jscomp/test/dist/jscomp/test/js_option_test.js
index 7f1bd90108..9a1fc42a5a 100644
--- a/jscomp/test/dist/jscomp/test/js_option_test.js
+++ b/jscomp/test/dist/jscomp/test/js_option_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_option = require("melange.js/js_option.js");
+var Mt = require("./mt.js");
 
 function simpleEq(a, b) {
   return a === b;
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 7a63f42398..e96b20801b 100644
--- a/jscomp/test/dist/jscomp/test/js_promise_basic_test.js
+++ b/jscomp/test/dist/jscomp/test/js_promise_basic_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_array = require("melange.js/caml_array.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_array = require("melange.js/caml_array.js");
 var Stdlib__List = require("melange/list.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/js_re_test.js b/jscomp/test/dist/jscomp/test/js_re_test.js
index 1fe53f858b..ac6fc7966e 100644
--- a/jscomp/test/dist/jscomp/test/js_re_test.js
+++ b/jscomp/test/dist/jscomp/test/js_re_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "captures",
diff --git a/jscomp/test/dist/jscomp/test/js_string_test.js b/jscomp/test/dist/jscomp/test/js_string_test.js
index 19e29180c3..d6d11caf21 100644
--- a/jscomp/test/dist/jscomp/test/js_string_test.js
+++ b/jscomp/test/dist/jscomp/test/js_string_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Belt__Belt_Option = require("melange.belt/belt_Option.js");
+var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "make",
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 6043e25c8e..b4cccde385 100644
--- a/jscomp/test/dist/jscomp/test/js_typed_array_test.js
+++ b/jscomp/test/dist/jscomp/test/js_typed_array_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 
 function mkI8(a) {
diff --git a/jscomp/test/dist/jscomp/test/js_undefined_test.js b/jscomp/test/dist/jscomp/test/js_undefined_test.js
index c09a2a2429..558497a131 100644
--- a/jscomp/test/dist/jscomp/test/js_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/js_undefined_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Js__Js_undefined = require("melange.js/js_undefined.js");
+var Mt = require("./mt.js");
 
 var suites_0 = [
   "toOption - empty",
diff --git a/jscomp/test/dist/jscomp/test/jsoo_400_test.js b/jscomp/test/dist/jscomp/test/jsoo_400_test.js
index 55fc934563..921c58b9f6 100644
--- a/jscomp/test/dist/jscomp/test/jsoo_400_test.js
+++ b/jscomp/test/dist/jscomp/test/jsoo_400_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
+var Mt = require("./mt.js");
 
 function u(param) {
   var n;
diff --git a/jscomp/test/dist/jscomp/test/key_word_property.js b/jscomp/test/dist/jscomp/test/key_word_property.js
index 8958768d45..15cc9a9e73 100644
--- a/jscomp/test/dist/jscomp/test/key_word_property.js
+++ b/jscomp/test/dist/jscomp/test/key_word_property.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Vscode = require("vscode");
-var SomeEs6Module = require("some-es6-module");
-var SomeEs6Module$1 = require("some-es6-module").default;
 var OmeEs6Module = require("./ome-es6-module").default;
 var OmeEs6Module$1 = require("./ome-es6-module");
+var SomeEs6Module = require("some-es6-module");
+var SomeEs6Module$1 = require("some-es6-module").default;
+var Vscode = require("vscode");
 
 var $$default = SomeEs6Module$1;
 
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 0c19a04fc9..6e93a1c149 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
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Global_mangles = require("./global_mangles.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/large_obj_test.js b/jscomp/test/dist/jscomp/test/large_obj_test.js
index a43fac2d26..df1509ff4a 100644
--- a/jscomp/test/dist/jscomp/test/large_obj_test.js
+++ b/jscomp/test/dist/jscomp/test/large_obj_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
 
 var shared = [
   "field0",
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 1c8640ffdc..30f60cb391 100644
--- a/jscomp/test/dist/jscomp/test/large_record_duplication_test.js
+++ b/jscomp/test/dist/jscomp/test/large_record_duplication_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/lazy_test.js b/jscomp/test/dist/jscomp/test/lazy_test.js
index 12108ff14d..d90b10f592 100644
--- a/jscomp/test/dist/jscomp/test/lazy_test.js
+++ b/jscomp/test/dist/jscomp/test/lazy_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__Lazy = require("melange/lazy.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var u = {
   contents: 3
diff --git a/jscomp/test/dist/jscomp/test/lexer_test.js b/jscomp/test/dist/jscomp/test/lexer_test.js
index 7f752014e3..ffee4fa896 100644
--- a/jscomp/test/dist/jscomp/test/lexer_test.js
+++ b/jscomp/test/dist/jscomp/test/lexer_test.js
@@ -1,16 +1,16 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Arith_lexer = require("./arith_lexer.js");
 var Arith_parser = require("./arith_parser.js");
 var Arith_syntax = require("./arith_syntax.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Number_lexer = require("./number_lexer.js");
-var Stdlib__List = require("melange/list.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
 
 function get_tokens(lex, str) {
   var buf = Stdlib__Lexing.from_string(undefined, str);
diff --git a/jscomp/test/dist/jscomp/test/libarg_test.js b/jscomp/test/dist/jscomp/test/libarg_test.js
index d345af30a2..568939711b 100644
--- a/jscomp/test/dist/jscomp/test/libarg_test.js
+++ b/jscomp/test/dist/jscomp/test/libarg_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Arg = require("melange/arg.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
diff --git a/jscomp/test/dist/jscomp/test/libqueue_test.js b/jscomp/test/dist/jscomp/test/libqueue_test.js
index 8ea8099405..cb9eeffa0d 100644
--- a/jscomp/test/dist/jscomp/test/libqueue_test.js
+++ b/jscomp/test/dist/jscomp/test/libqueue_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Queue = require("melange/queue.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function to_list(q) {
   return Stdlib__List.rev(Stdlib__Queue.fold((function (l, x) {
diff --git a/jscomp/test/dist/jscomp/test/list_test.js b/jscomp/test/dist/jscomp/test/list_test.js
index ac34d05109..b579f75eba 100644
--- a/jscomp/test/dist/jscomp/test/list_test.js
+++ b/jscomp/test/dist/jscomp/test/list_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Stdlib__List = require("melange/list.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 
 var list_suites_0 = [
   "length",
diff --git a/jscomp/test/dist/jscomp/test/loop_suites_test.js b/jscomp/test/dist/jscomp/test/loop_suites_test.js
index 5ff7568d84..2e5c4a8f57 100644
--- a/jscomp/test/dist/jscomp/test/loop_suites_test.js
+++ b/jscomp/test/dist/jscomp/test/loop_suites_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var For_loop_test = require("./for_loop_test.js");
+var Mt = require("./mt.js");
 
 Mt.from_pair_suites("for_loop_test", For_loop_test.suites);
 
diff --git a/jscomp/test/dist/jscomp/test/map_find_test.js b/jscomp/test/dist/jscomp/test/map_find_test.js
index 616ab4d2c7..e2859e7482 100644
--- a/jscomp/test/dist/jscomp/test/map_find_test.js
+++ b/jscomp/test/dist/jscomp/test/map_find_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 
diff --git a/jscomp/test/dist/jscomp/test/map_test.js b/jscomp/test/dist/jscomp/test/map_test.js
index a8b4994933..a1d3e627bd 100644
--- a/jscomp/test/dist/jscomp/test/map_test.js
+++ b/jscomp/test/dist/jscomp/test/map_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
diff --git a/jscomp/test/dist/jscomp/test/mario_game.js b/jscomp/test/dist/jscomp/test/mario_game.js
index 99fa91d61e..a4d61b67c4 100644
--- a/jscomp/test/dist/jscomp/test/mario_game.js
+++ b/jscomp/test/dist/jscomp/test/mario_game.js
@@ -2,11 +2,11 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__Random = require("melange/random.js");
diff --git a/jscomp/test/dist/jscomp/test/module_alias_test.js b/jscomp/test/dist/jscomp/test/module_alias_test.js
index 9d54f3d52c..73268e1fd6 100644
--- a/jscomp/test/dist/jscomp/test/module_alias_test.js
+++ b/jscomp/test/dist/jscomp/test/module_alias_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/module_missing_conversion.js b/jscomp/test/dist/jscomp/test/module_missing_conversion.js
index 53bc4c2f72..7d466ce9e7 100644
--- a/jscomp/test/dist/jscomp/test/module_missing_conversion.js
+++ b/jscomp/test/dist/jscomp/test/module_missing_conversion.js
@@ -3,8 +3,8 @@
 
 var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__String = require("melange/string.js");
 var Stdlib__MoreLabels = require("melange/moreLabels.js");
+var Stdlib__String = require("melange/string.js");
 
 function f(x) {
   return x;
diff --git a/jscomp/test/dist/jscomp/test/module_splice_test.js b/jscomp/test/dist/jscomp/test/module_splice_test.js
index 4129023d39..79b9c8ed7e 100644
--- a/jscomp/test/dist/jscomp/test/module_splice_test.js
+++ b/jscomp/test/dist/jscomp/test/module_splice_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var JoinClasses = require("./joinClasses");
 var Caml_splice_call = require("melange.js/caml_splice_call.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/mpr_6033_test.js b/jscomp/test/dist/jscomp/test/mpr_6033_test.js
index a133f23700..4627cb9c62 100644
--- a/jscomp/test/dist/jscomp/test/mpr_6033_test.js
+++ b/jscomp/test/dist/jscomp/test/mpr_6033_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/mt.js b/jscomp/test/dist/jscomp/test/mt.js
index 8754981df6..a2251ac4c3 100644
--- a/jscomp/test/dist/jscomp/test/mt.js
+++ b/jscomp/test/dist/jscomp/test/mt.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Path = require("path");
 var Curry = require("melange.js/curry.js");
+var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 var Assert = require("assert");
+var Path = require("path");
 var Process = require("process");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Array = require("melange/array.js");
 
 function assert_fail(msg) {
   Assert.fail(undefined, undefined, msg, "");
diff --git a/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js b/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
index b49a2d1dbf..e4088103a4 100644
--- a/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
+++ b/jscomp/test/dist/jscomp/test/mutable_uncurry_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/obj_test.js b/jscomp/test/dist/jscomp/test/obj_test.js
index 860c1e12e7..30ec7aabb1 100644
--- a/jscomp/test/dist/jscomp/test/obj_test.js
+++ b/jscomp/test/dist/jscomp/test/obj_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = [
   "hi",
diff --git a/jscomp/test/dist/jscomp/test/ocaml_414_upgrade_test.js b/jscomp/test/dist/jscomp/test/ocaml_414_upgrade_test.js
index 1d70947d6e..5852cc891a 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_414_upgrade_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_414_upgrade_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Curry = require("melange.js/curry.js");
 
 var N = {};
 
diff --git a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
index a0006d8f52..96175b0834 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_parsetree_test.js
@@ -2,38 +2,38 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Path = require("path");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Assert = require("assert");
-var Caml_io = require("melange.js/caml_io.js");
-var Process = require("process");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Caml_sys = require("melange.js/caml_sys.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Arg = require("melange/arg.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
+var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__Hashtbl = require("melange/hashtbl.js");
 var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
+var Stdlib__Parsing = require("melange/parsing.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Stdlib__Parsing = require("melange/parsing.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Stdlib__Filename = require("melange/filename.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Sys = require("melange/sys.js");
+var Assert = require("assert");
+var Path = require("path");
+var Process = require("process");
 
 try {
   Caml_sys.caml_sys_getenv("BSLIB");
diff --git a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
index 5d67aeb02d..b88e26d203 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_proto_test.js
@@ -1,26 +1,26 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Bytes = require("melange/bytes.js");
-var Stdlib__Lexing = require("melange/lexing.js");
-var Stdlib__Printf = require("melange/printf.js");
-var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Stdlib__Char = require("melange/char.js");
+var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
+var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Parsing = require("melange/parsing.js");
-var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Printexc = require("melange/printexc.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__String = require("melange/string.js");
 
 function field(optionsOpt, label, number, type_, name) {
   var options = optionsOpt !== undefined ? optionsOpt : /* [] */0;
diff --git a/jscomp/test/dist/jscomp/test/ocaml_re_test.js b/jscomp/test/dist/jscomp/test/ocaml_re_test.js
index 9ddcd68ce0..0b399a0e68 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_re_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_re_test.js
@@ -1,24 +1,24 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
 var Stdlib__Format = require("melange/format.js");
-var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib__List = require("melange/list.js");
+var Stdlib__String = require("melange/string.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
index 3c06d8e56b..c62f279651 100644
--- a/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
+++ b/jscomp/test/dist/jscomp/test/ocaml_typedtree_test.js
@@ -2,44 +2,44 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Path = require("path");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Assert = require("assert");
-var Caml_io = require("melange.js/caml_io.js");
-var Process = require("process");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Caml_sys = require("melange.js/caml_sys.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Arg = require("melange/arg.js");
-var Stdlib__Seq = require("melange/seq.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Bytes = require("melange/bytes.js");
-var Stdlib__Int32 = require("melange/int32.js");
-var Stdlib__Int64 = require("melange/int64.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
 var Stdlib__Digest = require("melange/digest.js");
+var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Format = require("melange/format.js");
-var Stdlib__Lexing = require("melange/lexing.js");
-var Stdlib__Printf = require("melange/printf.js");
-var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
+var Stdlib__Int32 = require("melange/int32.js");
+var Stdlib__Int64 = require("melange/int64.js");
+var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Marshal = require("melange/marshal.js");
 var Stdlib__Parsing = require("melange/parsing.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Printexc = require("melange/printexc.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__Seq = require("melange/seq.js");
+var Stdlib__String = require("melange/string.js");
+var Stdlib__Sys = require("melange/sys.js");
+var Assert = require("assert");
+var Path = require("path");
+var Process = require("process");
 
 try {
   Caml_sys.caml_sys_getenv("BSLIB");
diff --git a/jscomp/test/dist/jscomp/test/offset.js b/jscomp/test/dist/jscomp/test/offset.js
index d8d24b7723..7fdceedd10 100644
--- a/jscomp/test/dist/jscomp/test/offset.js
+++ b/jscomp/test/dist/jscomp/test/offset.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__Seq = require("melange/seq.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
+var Stdlib__Seq = require("melange/seq.js");
 var Stdlib__String = require("melange/string.js");
 
 var funarg = {
diff --git a/jscomp/test/dist/jscomp/test/opr_3576_test.js b/jscomp/test/dist/jscomp/test/opr_3576_test.js
index ea64381abe..3d4f2fb0bc 100644
--- a/jscomp/test/dist/jscomp/test/opr_3576_test.js
+++ b/jscomp/test/dist/jscomp/test/opr_3576_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = [
   "m1",
diff --git a/jscomp/test/dist/jscomp/test/opr_4560_test.js b/jscomp/test/dist/jscomp/test/opr_4560_test.js
index 30ab70d0e3..7320c1b663 100644
--- a/jscomp/test/dist/jscomp/test/opr_4560_test.js
+++ b/jscomp/test/dist/jscomp/test/opr_4560_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_oo_curry = require("melange.js/caml_oo_curry.js");
 var CamlinternalOO = require("melange/camlinternalOO.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var shared = ["b"];
 
diff --git a/jscomp/test/dist/jscomp/test/option_repr_test.js b/jscomp/test/dist/jscomp/test/option_repr_test.js
index 913e205d53..4593e731cb 100644
--- a/jscomp/test/dist/jscomp/test/option_repr_test.js
+++ b/jscomp/test/dist/jscomp/test/option_repr_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Belt__Belt_List = require("melange.belt/belt_List.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Belt__Belt_List = require("melange.belt/belt_List.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/optional_ffi_test.js b/jscomp/test/dist/jscomp/test/optional_ffi_test.js
index cca30a128d..e4ec35191a 100644
--- a/jscomp/test/dist/jscomp/test/optional_ffi_test.js
+++ b/jscomp/test/dist/jscomp/test/optional_ffi_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/optional_regression_test.js b/jscomp/test/dist/jscomp/test/optional_regression_test.js
index ccad081eb7..d1f47c510f 100644
--- a/jscomp/test/dist/jscomp/test/optional_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/optional_regression_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/parser_api.js b/jscomp/test/dist/jscomp/test/parser_api.js
index 9cd900a933..10a9f31cd6 100644
--- a/jscomp/test/dist/jscomp/test/parser_api.js
+++ b/jscomp/test/dist/jscomp/test/parser_api.js
@@ -2,36 +2,36 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_io = require("melange.js/caml_io.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_format = require("melange.js/caml_format.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
 var Caml_int64 = require("melange.js/caml_int64.js");
-var Caml_format = require("melange.js/caml_format.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Caml_sys = require("melange.js/caml_sys.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Arg = require("melange/arg.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Array = require("melange/array.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
+var Stdlib__Filename = require("melange/filename.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__Hashtbl = require("melange/hashtbl.js");
 var Stdlib__Lexing = require("melange/lexing.js");
+var Stdlib__List = require("melange/list.js");
+var Stdlib__Parsing = require("melange/parsing.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Stdlib__Hashtbl = require("melange/hashtbl.js");
-var Stdlib__Parsing = require("melange/parsing.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Stdlib__Filename = require("melange/filename.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Sys = require("melange/sys.js");
 
 var standard_library_default = "/Users/chenglou/Github/bucklescript/vendor/ocaml/lib/ocaml";
 
diff --git a/jscomp/test/dist/jscomp/test/pipe_syntax.js b/jscomp/test/dist/jscomp/test/pipe_syntax.js
index fd426a66a7..be8ba4b3f9 100644
--- a/jscomp/test/dist/jscomp/test/pipe_syntax.js
+++ b/jscomp/test/dist/jscomp/test/pipe_syntax.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
+var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
 
 function t0(x, f) {
   return Curry._1(f, Curry._1(f, Curry._1(f, x)));
diff --git a/jscomp/test/dist/jscomp/test/pr_regression_test.js b/jscomp/test/dist/jscomp/test/pr_regression_test.js
index 66e54e8cfc..6a59d54157 100644
--- a/jscomp/test/dist/jscomp/test/pr_regression_test.js
+++ b/jscomp/test/dist/jscomp/test/pr_regression_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var v = {
   contents: 3
diff --git a/jscomp/test/dist/jscomp/test/print_alpha_test.js b/jscomp/test/dist/jscomp/test/print_alpha_test.js
index e35fcb05a5..07a0627a0e 100644
--- a/jscomp/test/dist/jscomp/test/print_alpha_test.js
+++ b/jscomp/test/dist/jscomp/test/print_alpha_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 function f(h, param) {
   console.log(3);
diff --git a/jscomp/test/dist/jscomp/test/printf_test.js b/jscomp/test/dist/jscomp/test/printf_test.js
index 10ecf613e5..e9cb78d251 100644
--- a/jscomp/test/dist/jscomp/test/printf_test.js
+++ b/jscomp/test/dist/jscomp/test/printf_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Format = require("melange/format.js");
 var Stdlib__Printf = require("melange/printf.js");
 
diff --git a/jscomp/test/dist/jscomp/test/promise_catch_test.js b/jscomp/test/dist/jscomp/test/promise_catch_test.js
index 34b19bbbc2..cd6d57b0f3 100644
--- a/jscomp/test/dist/jscomp/test/promise_catch_test.js
+++ b/jscomp/test/dist/jscomp/test/promise_catch_test.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Stdlib = require("melange/stdlib.js");
-var Js__Js_exn = require("melange.js/js_exn.js");
-var Js__Js_option = require("melange.js/js_option.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Js__Js_exn = require("melange.js/js_exn.js");
+var Js__Js_option = require("melange.js/js_option.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/qcc.js b/jscomp/test/dist/jscomp/test/qcc.js
index 8851783616..486a3ecfd5 100644
--- a/jscomp/test/dist/jscomp/test/qcc.js
+++ b/jscomp/test/dist/jscomp/test/qcc.js
@@ -1,22 +1,22 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_io = require("melange.js/caml_io.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Caml_sys = require("melange.js/caml_sys.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Char = require("melange/char.js");
 var Stdlib__List = require("melange/list.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
 
 var dbg = {
   contents: true
diff --git a/jscomp/test/dist/jscomp/test/queue_test.js b/jscomp/test/dist/jscomp/test/queue_test.js
index fe42563db1..cd2b3955f3 100644
--- a/jscomp/test/dist/jscomp/test/queue_test.js
+++ b/jscomp/test/dist/jscomp/test/queue_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Queue = require("melange/queue.js");
 
diff --git a/jscomp/test/dist/jscomp/test/random_test.js b/jscomp/test/dist/jscomp/test/random_test.js
index 2fe9d8c4ee..eaace1b76e 100644
--- a/jscomp/test/dist/jscomp/test/random_test.js
+++ b/jscomp/test/dist/jscomp/test/random_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_array = require("melange.js/caml_array.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
-var Caml_array = require("melange.js/caml_array.js");
 var Stdlib__Int64 = require("melange/int64.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__Random = require("melange/random.js");
diff --git a/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js b/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js
index c42eb22b5a..f18fce302a 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/inline_map_demo.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("../mt.js");
 var Caml = require("melange.js/caml.js");
+var Mt = require("../mt.js");
 var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 
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 89555bcb99..1a32f1a489 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reactDOMRe.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reactDOMRe.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var React = require("react");
 var Stdlib = require("melange/stdlib.js");
+var React = require("react");
 var ReactDom = require("react-dom");
 
 function renderToElementWithClassName(reactElement, className) {
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 1a16b611e6..1c4e7acd00 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reactTestUtils.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reactTestUtils.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Belt__Belt_Array = require("melange.belt/belt_Array.js");
 var Belt__Belt_Option = require("melange.belt/belt_Option.js");
+var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
 var TestUtils = require("react-dom/test-utils");
 
 function act(func) {
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 4f48d15f7d..0979dcbccd 100644
--- a/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js
+++ b/jscomp/test/dist/jscomp/test/re_or_res/reasonReact.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var React = require("react");
-var Stdlib = require("melange/stdlib.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
 var ReasonReactOptimizedCreateClass = require("./reasonReactOptimizedCreateClass.js");
+var Stdlib = require("melange/stdlib.js");
+var React = require("react");
 
 function createDomElement(s, props, children) {
   var vararg = [
diff --git a/jscomp/test/dist/jscomp/test/rec_fun_test.js b/jscomp/test/dist/jscomp/test/rec_fun_test.js
index 6e652de22d..c4024597bc 100644
--- a/jscomp/test/dist/jscomp/test/rec_fun_test.js
+++ b/jscomp/test/dist/jscomp/test/rec_fun_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/rec_module_test.js b/jscomp/test/dist/jscomp/test/rec_module_test.js
index edc9b9b660..5607980288 100644
--- a/jscomp/test/dist/jscomp/test/rec_module_test.js
+++ b/jscomp/test/dist/jscomp/test/rec_module_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__Seq = require("melange/seq.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
+var Stdlib__Seq = require("melange/seq.js");
 
 function even(n) {
   if (n === 0) {
diff --git a/jscomp/test/dist/jscomp/test/rec_value_test.js b/jscomp/test/dist/jscomp/test/rec_value_test.js
index 70a10c6fb4..6debea714d 100644
--- a/jscomp/test/dist/jscomp/test/rec_value_test.js
+++ b/jscomp/test/dist/jscomp/test/rec_value_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Stdlib__List = require("melange/list.js");
 var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Stdlib__List = require("melange/list.js");
 
 var x = {};
 
diff --git a/jscomp/test/dist/jscomp/test/record_debug_test.js b/jscomp/test/dist/jscomp/test/record_debug_test.js
index b006b5c6f8..30aab4790b 100644
--- a/jscomp/test/dist/jscomp/test/record_debug_test.js
+++ b/jscomp/test/dist/jscomp/test/record_debug_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Mt = require("./mt.js");
 var Stdlib__Format = require("melange/format.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/record_extension_test.js b/jscomp/test/dist/jscomp/test/record_extension_test.js
index bada48a707..cfc8e86bcf 100644
--- a/jscomp/test/dist/jscomp/test/record_extension_test.js
+++ b/jscomp/test/dist/jscomp/test/record_extension_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
-var Caml_format = require("melange.js/caml_format.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_format = require("melange.js/caml_format.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/record_with_test.js b/jscomp/test/dist/jscomp/test/record_with_test.js
index 91b656683f..de14b00f82 100644
--- a/jscomp/test/dist/jscomp/test/record_with_test.js
+++ b/jscomp/test/dist/jscomp/test/record_with_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var v = {
   syntax: undefined,
diff --git a/jscomp/test/dist/jscomp/test/recursive_module.js b/jscomp/test/dist/jscomp/test/recursive_module.js
index 630ffc320f..dd92221b8f 100644
--- a/jscomp/test/dist/jscomp/test/recursive_module.js
+++ b/jscomp/test/dist/jscomp/test/recursive_module.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_module = require("melange.js/caml_module.js");
+var CamlinternalLazy = require("melange/camlinternalLazy.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_module = require("melange.js/caml_module.js");
 var Stdlib__Lazy = require("melange/lazy.js");
-var CamlinternalLazy = require("melange/camlinternalLazy.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/recursive_module_test.js b/jscomp/test/dist/jscomp/test/recursive_module_test.js
index 46746046fd..e98c8fcea3 100644
--- a/jscomp/test/dist/jscomp/test/recursive_module_test.js
+++ b/jscomp/test/dist/jscomp/test/recursive_module_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_module = require("melange.js/caml_module.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/recursive_records_test.js b/jscomp/test/dist/jscomp/test/recursive_records_test.js
index 0cedd6adad..1b0c394f04 100644
--- a/jscomp/test/dist/jscomp/test/recursive_records_test.js
+++ b/jscomp/test/dist/jscomp/test/recursive_records_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 
 var suites = {
diff --git a/jscomp/test/dist/jscomp/test/scanf_io.js b/jscomp/test/dist/jscomp/test/scanf_io.js
index 9666d640ce..b0ac8b9231 100644
--- a/jscomp/test/dist/jscomp/test/scanf_io.js
+++ b/jscomp/test/dist/jscomp/test/scanf_io.js
@@ -1,19 +1,19 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
+var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
 var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Bytes = require("melange/bytes.js");
-var Stdlib__Scanf = require("melange/scanf.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Digest = require("melange/digest.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Scanf = require("melange/scanf.js");
 
 var tscanf_data_file = "tscanf_data";
 
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 10753d6b50..25edfe6c9c 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
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
 var Stdlib__List = require("melange/list.js");
-var Stdlib__Scanf = require("melange/scanf.js");
 var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__Scanf = require("melange/scanf.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/scanf_test.js b/jscomp/test/dist/jscomp/test/scanf_test.js
index 93bdb3e0dc..211191592d 100644
--- a/jscomp/test/dist/jscomp/test/scanf_test.js
+++ b/jscomp/test/dist/jscomp/test/scanf_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
 var Stdlib__Scanf = require("melange/scanf.js");
 
diff --git a/jscomp/test/dist/jscomp/test/set_gen.js b/jscomp/test/dist/jscomp/test/set_gen.js
index ca1e9cdefa..92e8762860 100644
--- a/jscomp/test/dist/jscomp/test/set_gen.js
+++ b/jscomp/test/dist/jscomp/test/set_gen.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Stdlib__List = require("melange/list.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 function cons_enum(_s, _e) {
   while(true) {
diff --git a/jscomp/test/dist/jscomp/test/sexp.js b/jscomp/test/dist/jscomp/test/sexp.js
index 8454b412a2..6350e2cfd2 100644
--- a/jscomp/test/dist/jscomp/test/sexp.js
+++ b/jscomp/test/dist/jscomp/test/sexp.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Hashtbl = require("melange/hashtbl.js");
+var Stdlib__List = require("melange/list.js");
 
 var equal = Caml_obj.caml_equal;
 
diff --git a/jscomp/test/dist/jscomp/test/sexpm.js b/jscomp/test/dist/jscomp/test/sexpm.js
index 0c37805260..d56cf1c947 100644
--- a/jscomp/test/dist/jscomp/test/sexpm.js
+++ b/jscomp/test/dist/jscomp/test/sexpm.js
@@ -2,21 +2,21 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
+var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_io = require("melange.js/caml_io.js");
-var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__Char = require("melange/char.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__Char = require("melange/char.js");
 var Stdlib__Format = require("melange/format.js");
+var Stdlib__List = require("melange/list.js");
+var Stdlib__Printexc = require("melange/printexc.js");
 var Stdlib__Printf = require("melange/printf.js");
 var Stdlib__String = require("melange/string.js");
-var Stdlib__Printexc = require("melange/printexc.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Stdlib__Sys = require("melange/sys.js");
 
 function _with_in(filename, f) {
   var ic = Stdlib.open_in_bin(filename);
diff --git a/jscomp/test/dist/jscomp/test/sexpm_test.js b/jscomp/test/dist/jscomp/test/sexpm_test.js
index b9f9fb9b17..9ea36223ec 100644
--- a/jscomp/test/dist/jscomp/test/sexpm_test.js
+++ b/jscomp/test/dist/jscomp/test/sexpm_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Sexpm = require("./sexpm.js");
 var Stdlib__Format = require("melange/format.js");
 
diff --git a/jscomp/test/dist/jscomp/test/simple_lexer_test.js b/jscomp/test/dist/jscomp/test/simple_lexer_test.js
index 091cdc47bb..44dc1fe20c 100644
--- a/jscomp/test/dist/jscomp/test/simple_lexer_test.js
+++ b/jscomp/test/dist/jscomp/test/simple_lexer_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Lexing = require("melange/lexing.js");
 
diff --git a/jscomp/test/dist/jscomp/test/splice_test.js b/jscomp/test/dist/jscomp/test/splice_test.js
index 4b25dbafa1..881ec5f383 100644
--- a/jscomp/test/dist/jscomp/test/splice_test.js
+++ b/jscomp/test/dist/jscomp/test/splice_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_splice_call = require("melange.js/caml_splice_call.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/sprintf_reg_test.js b/jscomp/test/dist/jscomp/test/sprintf_reg_test.js
index ce81ff8c23..f1c900bd97 100644
--- a/jscomp/test/dist/jscomp/test/sprintf_reg_test.js
+++ b/jscomp/test/dist/jscomp/test/sprintf_reg_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
 var Stdlib__Printf = require("melange/printf.js");
 
diff --git a/jscomp/test/dist/jscomp/test/stack_comp_test.js b/jscomp/test/dist/jscomp/test/stack_comp_test.js
index bb4c359212..eb65fb1bae 100644
--- a/jscomp/test/dist/jscomp/test/stack_comp_test.js
+++ b/jscomp/test/dist/jscomp/test/stack_comp_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Mt_global = require("./mt_global.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Stack = require("melange/stack.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/stack_test.js b/jscomp/test/dist/jscomp/test/stack_test.js
index 9f3e7f35e3..46f6235f39 100644
--- a/jscomp/test/dist/jscomp/test/stack_test.js
+++ b/jscomp/test/dist/jscomp/test/stack_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Stack = require("melange/stack.js");
 
diff --git a/jscomp/test/dist/jscomp/test/stream_parser_test.js b/jscomp/test/dist/jscomp/test/stream_parser_test.js
index 661ea35d2f..3224a38c2e 100644
--- a/jscomp/test/dist/jscomp/test/stream_parser_test.js
+++ b/jscomp/test/dist/jscomp/test/stream_parser_test.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
-var Stdlib__Queue = require("melange/queue.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__Genlex = require("melange/genlex.js");
+var Stdlib__Queue = require("melange/queue.js");
 var Stdlib__Stream = require("melange/stream.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var Parse_error = /* @__PURE__ */Caml_exceptions.create("Stream_parser_test.Parse_error");
 
diff --git a/jscomp/test/dist/jscomp/test/string_runtime_test.js b/jscomp/test/dist/jscomp/test/string_runtime_test.js
index 4372207246..335df31bd4 100644
--- a/jscomp/test/dist/jscomp/test/string_runtime_test.js
+++ b/jscomp/test/dist/jscomp/test/string_runtime_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Test_char = require("./test_char.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__List = require("melange/list.js");
+var Mt = require("./mt.js");
 var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__List = require("melange/list.js");
+var Test_char = require("./test_char.js");
 
 var suites_0 = [
   "caml_is_printable",
diff --git a/jscomp/test/dist/jscomp/test/string_set.js b/jscomp/test/dist/jscomp/test/string_set.js
index 5dd9936f30..3f94f32765 100644
--- a/jscomp/test/dist/jscomp/test/string_set.js
+++ b/jscomp/test/dist/jscomp/test/string_set.js
@@ -2,10 +2,10 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Stdlib = require("melange/stdlib.js");
 var Set_gen = require("./set_gen.js");
-var Stdlib__List = require("melange/list.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
 
 function split(x, tree) {
diff --git a/jscomp/test/dist/jscomp/test/string_test.js b/jscomp/test/dist/jscomp/test/string_test.js
index 4c9634a93f..d3994d55c8 100644
--- a/jscomp/test/dist/jscomp/test/string_test.js
+++ b/jscomp/test/dist/jscomp/test/string_test.js
@@ -1,14 +1,14 @@
 // Generated by Melange
 'use strict';
 
+var Caml_bytes = require("melange.js/caml_bytes.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Ext_string_test = require("./ext_string_test.js");
 var Mt = require("./mt.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_bytes = require("melange.js/caml_bytes.js");
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Bytes = require("melange/bytes.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
-var Ext_string_test = require("./ext_string_test.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function ff(x) {
   var a;
diff --git a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
index c275c289d2..9fa8a64cff 100644
--- a/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
+++ b/jscomp/test/dist/jscomp/test/tailcall_inline_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Mt = require("./mt.js");
 var Stdlib__Array = require("melange/array.js");
 
 function f(param) {
diff --git a/jscomp/test/dist/jscomp/test/test_ari.js b/jscomp/test/dist/jscomp/test/test_ari.js
index ad9feb61bf..0b2946834f 100644
--- a/jscomp/test/dist/jscomp/test/test_ari.js
+++ b/jscomp/test/dist/jscomp/test/test_ari.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var U = require("U");
-var VV = require("VV");
 var Curry = require("melange.js/curry.js");
 var Stdlib__List = require("melange/list.js");
+var U = require("U");
+var VV = require("VV");
 
 function f(x) {
   return function (param) {
diff --git a/jscomp/test/dist/jscomp/test/test_bug.js b/jscomp/test/dist/jscomp/test/test_bug.js
index c13c8a4144..2db6181dc9 100644
--- a/jscomp/test/dist/jscomp/test/test_bug.js
+++ b/jscomp/test/dist/jscomp/test/test_bug.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Test_char = require("./test_char.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
 var Stdlib__Bytes = require("melange/bytes.js");
+var Test_char = require("./test_char.js");
 
 function escaped(s) {
   var n = 0;
diff --git a/jscomp/test/dist/jscomp/test/test_closure.js b/jscomp/test/dist/jscomp/test/test_closure.js
index 8366c6e7a6..82f34a97b5 100644
--- a/jscomp/test/dist/jscomp/test/test_closure.js
+++ b/jscomp/test/dist/jscomp/test/test_closure.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
 
 var v = {
diff --git a/jscomp/test/dist/jscomp/test/test_cps.js b/jscomp/test/dist/jscomp/test/test_cps.js
index fbe6fcf7e7..840f2bbd3b 100644
--- a/jscomp/test/dist/jscomp/test/test_cps.js
+++ b/jscomp/test/dist/jscomp/test/test_cps.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
 
 function f(_n, _acc) {
   while(true) {
diff --git a/jscomp/test/dist/jscomp/test/test_exception.js b/jscomp/test/dist/jscomp/test/test_exception.js
index 88af69286c..5be93dc3d2 100644
--- a/jscomp/test/dist/jscomp/test/test_exception.js
+++ b/jscomp/test/dist/jscomp/test/test_exception.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Stdlib = require("melange/stdlib.js");
 var Test_common = require("./test_common.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
 
 var Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local");
 
diff --git a/jscomp/test/dist/jscomp/test/test_filename.js b/jscomp/test/dist/jscomp/test/test_filename.js
index a81dd163f1..4cf6b39df3 100644
--- a/jscomp/test/dist/jscomp/test/test_filename.js
+++ b/jscomp/test/dist/jscomp/test/test_filename.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib__List = require("melange/list.js");
 var Stdlib__Filename = require("melange/filename.js");
+var Stdlib__List = require("melange/list.js");
 
 var u = Stdlib__Filename.chop_extension;
 
diff --git a/jscomp/test/dist/jscomp/test/test_for_loop.js b/jscomp/test/dist/jscomp/test/test_for_loop.js
index 5af2160b35..ce6b3675c6 100644
--- a/jscomp/test/dist/jscomp/test/test_for_loop.js
+++ b/jscomp/test/dist/jscomp/test/test_for_loop.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
 
 function for_(x) {
diff --git a/jscomp/test/dist/jscomp/test/test_for_map.js b/jscomp/test/dist/jscomp/test/test_for_map.js
index dacd2ba80f..92cb415cf9 100644
--- a/jscomp/test/dist/jscomp/test/test_for_map.js
+++ b/jscomp/test/dist/jscomp/test/test_for_map.js
@@ -2,9 +2,9 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
+var Caml_option = require("melange.js/caml_option.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_option = require("melange.js/caml_option.js");
 var Stdlib__Seq = require("melange/seq.js");
 
 var compare = Caml.caml_int_compare;
diff --git a/jscomp/test/dist/jscomp/test/test_include.js b/jscomp/test/dist/jscomp/test/test_include.js
index 843cf646fe..4fe3945a11 100644
--- a/jscomp/test/dist/jscomp/test/test_include.js
+++ b/jscomp/test/dist/jscomp/test/test_include.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Test_order = require("./test_order.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__String = require("melange/string.js");
+var Test_order = require("./test_order.js");
 
 function Make(U) {
   var compare = U.compare;
diff --git a/jscomp/test/dist/jscomp/test/test_internalOO.js b/jscomp/test/dist/jscomp/test/test_internalOO.js
index a5ef2cff43..6b37dc3a7a 100644
--- a/jscomp/test/dist/jscomp/test/test_internalOO.js
+++ b/jscomp/test/dist/jscomp/test/test_internalOO.js
@@ -2,19 +2,19 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_oo = require("melange.js/caml_oo.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_array = require("melange.js/caml_array.js");
 var Caml_int32 = require("melange.js/caml_int32.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Caml_oo = require("melange.js/caml_oo.js");
 var Caml_option = require("melange.js/caml_option.js");
 var Caml_string = require("melange.js/caml_string.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__Array = require("melange/array.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Seq = require("melange/seq.js");
 var Stdlib__Sys = require("melange/sys.js");
-var Stdlib__List = require("melange/list.js");
-var Stdlib__Array = require("melange/array.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function copy(o) {
   return Caml_oo.caml_set_oo_id(Caml_obj.caml_obj_dup(o));
diff --git a/jscomp/test/dist/jscomp/test/test_list.js b/jscomp/test/dist/jscomp/test/test_list.js
index b743e38465..c610eb02aa 100644
--- a/jscomp/test/dist/jscomp/test/test_list.js
+++ b/jscomp/test/dist/jscomp/test/test_list.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_obj = require("melange.js/caml_obj.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Stdlib__List = require("melange/list.js");
 
 function length_aux(_len, _param) {
diff --git a/jscomp/test/dist/jscomp/test/test_match_exception.js b/jscomp/test/dist/jscomp/test/test_match_exception.js
index aceb4a49e7..6bd3327da4 100644
--- a/jscomp/test/dist/jscomp/test/test_match_exception.js
+++ b/jscomp/test/dist/jscomp/test/test_match_exception.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function f(g, x) {
   try {
diff --git a/jscomp/test/dist/jscomp/test/test_per.js b/jscomp/test/dist/jscomp/test/test_per.js
index 112a0fc7ec..8f099389f5 100644
--- a/jscomp/test/dist/jscomp/test/test_per.js
+++ b/jscomp/test/dist/jscomp/test/test_per.js
@@ -1,18 +1,18 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_io = require("melange.js/caml_io.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Caml_sys = require("melange.js/caml_sys.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
-var Caml_format = require("melange.js/caml_format.js");
-var Caml_string = require("melange.js/caml_string.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_external_polyfill = require("melange.js/caml_external_polyfill.js");
+var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_io = require("melange.js/caml_io.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Caml_string = require("melange.js/caml_string.js");
+var Caml_sys = require("melange.js/caml_sys.js");
 var CamlinternalFormatBasics = require("melange/camlinternalFormatBasics.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 
 function failwith(s) {
   throw {
diff --git a/jscomp/test/dist/jscomp/test/test_pervasives2.js b/jscomp/test/dist/jscomp/test/test_pervasives2.js
index a8e2c2069a..f0bbf44657 100644
--- a/jscomp/test/dist/jscomp/test/test_pervasives2.js
+++ b/jscomp/test/dist/jscomp/test/test_pervasives2.js
@@ -2,8 +2,8 @@
 'use strict';
 
 var Stdlib__List = require("melange/list.js");
-var Stdlib__Stack = require("melange/stack.js");
 var Stdlib__Pervasives = require("melange/pervasives.js");
+var Stdlib__Stack = require("melange/stack.js");
 
 var List = {
   length: Stdlib__List.length,
diff --git a/jscomp/test/dist/jscomp/test/test_primitive.js b/jscomp/test/dist/jscomp/test/test_primitive.js
index c0ae3567dc..cfb58af583 100644
--- a/jscomp/test/dist/jscomp/test/test_primitive.js
+++ b/jscomp/test/dist/jscomp/test/test_primitive.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_array = require("melange.js/caml_array.js");
 var CamlinternalLazy = require("melange/camlinternalLazy.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 
 function a4(prim) {
   return [
diff --git a/jscomp/test/dist/jscomp/test/test_react.js b/jscomp/test/dist/jscomp/test/test_react.js
index 3e1f1794c6..3250395858 100644
--- a/jscomp/test/dist/jscomp/test/test_react.js
+++ b/jscomp/test/dist/jscomp/test/test_react.js
@@ -1,12 +1,12 @@
 // Generated by Melange
 'use strict';
 
-var C = require("c");
+var C = require("a/b/c");
 var C$1 = require("b/c");
-var Xxx = require("xxx");
-var C$2 = require("a/b/c");
+var C$2 = require("c");
 var React = require("react");
 var ReactDom = require("react-dom");
+var Xxx = require("xxx");
 
 console.log("hey");
 
@@ -26,12 +26,12 @@ function f(param) {
   Xxx();
   Xxx.xx();
   Xxx.xxx();
-  C$2.x();
-  C$2.y();
-  C$1.x();
-  C$1.y();
   C.x();
   C.y();
+  C$1.x();
+  C$1.y();
+  C$2.x();
+  C$2.y();
 }
 
 var v;
diff --git a/jscomp/test/dist/jscomp/test/test_seq.js b/jscomp/test/dist/jscomp/test/test_seq.js
index 451ce30cf9..811f0e77ac 100644
--- a/jscomp/test/dist/jscomp/test/test_seq.js
+++ b/jscomp/test/dist/jscomp/test/test_seq.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 
 var Bad = /* @__PURE__ */Caml_exceptions.create("Test_seq.Bad");
 
diff --git a/jscomp/test/dist/jscomp/test/test_static_catch_ident.js b/jscomp/test/dist/jscomp/test/test_static_catch_ident.js
index f6df2b34e3..f464d0ed63 100644
--- a/jscomp/test/dist/jscomp/test/test_static_catch_ident.js
+++ b/jscomp/test/dist/jscomp/test/test_static_catch_ident.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib = require("melange/stdlib.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Stdlib = require("melange/stdlib.js");
 
 var Scan_failure = /* @__PURE__ */Caml_exceptions.create("Test_static_catch_ident.Scan_failure");
 
diff --git a/jscomp/test/dist/jscomp/test/test_string_const.js b/jscomp/test/dist/jscomp/test/test_string_const.js
index 8066becc4a..e981ccce74 100644
--- a/jscomp/test/dist/jscomp/test/test_string_const.js
+++ b/jscomp/test/dist/jscomp/test/test_string_const.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Stdlib = require("melange/stdlib.js");
-var Caml_string = require("melange.js/caml_string.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_string = require("melange.js/caml_string.js");
+var Stdlib = require("melange/stdlib.js");
 
 var hh;
 
diff --git a/jscomp/test/dist/jscomp/test/test_trywith.js b/jscomp/test/dist/jscomp/test/test_trywith.js
index d1739ea0a8..376ea5e307 100644
--- a/jscomp/test/dist/jscomp/test/test_trywith.js
+++ b/jscomp/test/dist/jscomp/test/test_trywith.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Curry = require("melange.js/curry.js");
 var Stdlib = require("melange/stdlib.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function ff(g, x) {
   try {
diff --git a/jscomp/test/dist/jscomp/test/test_while_closure.js b/jscomp/test/dist/jscomp/test/test_while_closure.js
index 36d05efd95..86c04b3452 100644
--- a/jscomp/test/dist/jscomp/test/test_while_closure.js
+++ b/jscomp/test/dist/jscomp/test/test_while_closure.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_array = require("melange.js/caml_array.js");
+var Curry = require("melange.js/curry.js");
 var Stdlib__Array = require("melange/array.js");
 
 var v = {
diff --git a/jscomp/test/dist/jscomp/test/test_zero_nullable.js b/jscomp/test/dist/jscomp/test/test_zero_nullable.js
index ffec21fe3e..ec34716922 100644
--- a/jscomp/test/dist/jscomp/test/test_zero_nullable.js
+++ b/jscomp/test/dist/jscomp/test/test_zero_nullable.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/testing.js b/jscomp/test/dist/jscomp/test/testing.js
index ce964da86d..7480c5e131 100644
--- a/jscomp/test/dist/jscomp/test/testing.js
+++ b/jscomp/test/dist/jscomp/test/testing.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Caml_io = require("melange.js/caml_io.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_obj = require("melange.js/caml_obj.js");
-var Stdlib__Scanf = require("melange/scanf.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Printf = require("melange/printf.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Stdlib__Scanf = require("melange/scanf.js");
 
 var all_tests_ok = {
   contents: true
diff --git a/jscomp/test/dist/jscomp/test/tfloat_record_test.js b/jscomp/test/dist/jscomp/test/tfloat_record_test.js
index 9add77722a..175322054c 100644
--- a/jscomp/test/dist/jscomp/test/tfloat_record_test.js
+++ b/jscomp/test/dist/jscomp/test/tfloat_record_test.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Mt_global = require("./mt_global.js");
 var Float_array = require("./float_array.js");
+var Mt = require("./mt.js");
+var Mt_global = require("./mt_global.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__Array = require("melange/array.js");
 var Stdlib__Buffer = require("melange/buffer.js");
 var Stdlib__Format = require("melange/format.js");
diff --git a/jscomp/test/dist/jscomp/test/ticker.js b/jscomp/test/dist/jscomp/test/ticker.js
index 4ffe73a997..1f230b0514 100644
--- a/jscomp/test/dist/jscomp/test/ticker.js
+++ b/jscomp/test/dist/jscomp/test/ticker.js
@@ -2,16 +2,16 @@
 'use strict';
 
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__Seq = require("melange/seq.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__Seq = require("melange/seq.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 function split(delim, s) {
   var len = s.length;
diff --git a/jscomp/test/dist/jscomp/test/topsort_test.js b/jscomp/test/dist/jscomp/test/topsort_test.js
index f5d9eddf5c..b4530faeed 100644
--- a/jscomp/test/dist/jscomp/test/topsort_test.js
+++ b/jscomp/test/dist/jscomp/test/topsort_test.js
@@ -1,15 +1,15 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
+var Caml_exceptions = require("melange.js/caml_exceptions.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_option = require("melange.js/caml_option.js");
-var Stdlib__Seq = require("melange/seq.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 var Stdlib__List = require("melange/list.js");
+var Stdlib__Seq = require("melange/seq.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_exceptions = require("melange.js/caml_exceptions.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
 
 var graph = {
   hd: [
diff --git a/jscomp/test/dist/jscomp/test/tscanf_test.js b/jscomp/test/dist/jscomp/test/tscanf_test.js
index d877103fe2..59fd4054c8 100644
--- a/jscomp/test/dist/jscomp/test/tscanf_test.js
+++ b/jscomp/test/dist/jscomp/test/tscanf_test.js
@@ -1,25 +1,25 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml = require("melange.js/caml.js");
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Testing = require("./testing.js");
-var Caml_obj = require("melange.js/caml_obj.js");
-var Mt_global = require("./mt_global.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
-var Caml_int64 = require("melange.js/caml_int64.js");
 var Caml_format = require("melange.js/caml_format.js");
+var Caml_int64 = require("melange.js/caml_int64.js");
+var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_string = require("melange.js/caml_string.js");
-var Stdlib__List = require("melange/list.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
+var Mt_global = require("./mt_global.js");
+var Stdlib = require("melange/stdlib.js");
+var Stdlib__Buffer = require("melange/buffer.js");
 var Stdlib__Bytes = require("melange/bytes.js");
 var Stdlib__Int32 = require("melange/int32.js");
-var Stdlib__Scanf = require("melange/scanf.js");
-var Stdlib__Buffer = require("melange/buffer.js");
+var Stdlib__List = require("melange/list.js");
 var Stdlib__Printf = require("melange/printf.js");
+var Stdlib__Scanf = require("melange/scanf.js");
 var Stdlib__String = require("melange/string.js");
-var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Testing = require("./testing.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/typeof_test.js b/jscomp/test/dist/jscomp/test/typeof_test.js
index 81ed398e5c..17c0952c2c 100644
--- a/jscomp/test/dist/jscomp/test/typeof_test.js
+++ b/jscomp/test/dist/jscomp/test/typeof_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Js__Js_types = require("melange.js/js_types.js");
+var Mt = require("./mt.js");
 
 function string_or_number(x) {
   var ty = Js__Js_types.classify(x);
diff --git a/jscomp/test/dist/jscomp/test/unboxed_use_case.js b/jscomp/test/dist/jscomp/test/unboxed_use_case.js
index 154580c0cb..7219a8a254 100644
--- a/jscomp/test/dist/jscomp/test/unboxed_use_case.js
+++ b/jscomp/test/dist/jscomp/test/unboxed_use_case.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
 
 function map_pair(r, param) {
   return [
diff --git a/jscomp/test/dist/jscomp/test/undef_regression2_test.js b/jscomp/test/dist/jscomp/test/undef_regression2_test.js
index 1f38d43786..b81fcab527 100644
--- a/jscomp/test/dist/jscomp/test/undef_regression2_test.js
+++ b/jscomp/test/dist/jscomp/test/undef_regression2_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/unit_undefined_test.js b/jscomp/test/dist/jscomp/test/unit_undefined_test.js
index a05077e0a4..30f1192260 100644
--- a/jscomp/test/dist/jscomp/test/unit_undefined_test.js
+++ b/jscomp/test/dist/jscomp/test/unit_undefined_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_option = require("melange.js/caml_option.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js b/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
index 9b3f358f06..ba00a12947 100644
--- a/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
+++ b/jscomp/test/dist/jscomp/test/unsafe_ppx_test.js
@@ -1,10 +1,10 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
 var Ffi_js_test = require("./ffi_js_test.js");
+var Mt = require("./mt.js");
+var Stdlib = require("melange/stdlib.js");
 
 var x = "\x01\x02\x03";
 
diff --git a/jscomp/test/dist/jscomp/test/update_record_test.js b/jscomp/test/dist/jscomp/test/update_record_test.js
index 74719a0a39..9d96c7dbc6 100644
--- a/jscomp/test/dist/jscomp/test/update_record_test.js
+++ b/jscomp/test/dist/jscomp/test/update_record_test.js
@@ -1,8 +1,8 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
 var Caml_obj = require("melange.js/caml_obj.js");
+var Mt = require("./mt.js");
 
 var suites = {
   contents: /* [] */0
diff --git a/jscomp/test/dist/jscomp/test/utf8_decode_test.js b/jscomp/test/dist/jscomp/test/utf8_decode_test.js
index 045e0c2077..4490f78f4a 100644
--- a/jscomp/test/dist/jscomp/test/utf8_decode_test.js
+++ b/jscomp/test/dist/jscomp/test/utf8_decode_test.js
@@ -1,9 +1,9 @@
 // Generated by Melange
 'use strict';
 
-var Mt = require("./mt.js");
-var Curry = require("melange.js/curry.js");
 var Caml_bytes = require("melange.js/caml_bytes.js");
+var Curry = require("melange.js/curry.js");
+var Mt = require("./mt.js");
 var Stdlib__List = require("melange/list.js");
 var Stdlib__Stream = require("melange/stream.js");
 
diff --git a/jscomp/test/dist/jscomp/test/variant.js b/jscomp/test/dist/jscomp/test/variant.js
index 0e5d6bc2be..1a666c43a1 100644
--- a/jscomp/test/dist/jscomp/test/variant.js
+++ b/jscomp/test/dist/jscomp/test/variant.js
@@ -1,11 +1,11 @@
 // Generated by Melange
 'use strict';
 
-var Curry = require("melange.js/curry.js");
-var Stdlib = require("melange/stdlib.js");
-var Caml_obj = require("melange.js/caml_obj.js");
 var Caml_exceptions = require("melange.js/caml_exceptions.js");
 var Caml_js_exceptions = require("melange.js/caml_js_exceptions.js");
+var Caml_obj = require("melange.js/caml_obj.js");
+var Curry = require("melange.js/curry.js");
+var Stdlib = require("melange/stdlib.js");
 
 function foo(n) {
   if (typeof n === "number") {
diff --git a/jscomp/test/dist/jscomp/test/webpack_config.js b/jscomp/test/dist/jscomp/test/webpack_config.js
index 707f92c387..bd59a445e1 100644
--- a/jscomp/test/dist/jscomp/test/webpack_config.js
+++ b/jscomp/test/dist/jscomp/test/webpack_config.js
@@ -1,13 +1,13 @@
 // Generated by Melange
 'use strict';
 
+var WebpackConfigJs = require("../../../webpack.config.js");
+var WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js");
+var Local = require("./local");
 var List = require("List");
+var Stdlib__List = require("melange/list.js");
 var List$1 = require("reactV");
 var List$2 = require("reactX");
-var Local = require("./local");
-var Stdlib__List = require("melange/list.js");
-var WebpackConfigJs = require("../../../webpack.config.js");
-var WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js");
 
 var configx = WebpackConfigJs;