diff --git a/jscomp/core/js_of_lam_block.ml b/jscomp/core/js_of_lam_block.ml
index 3949bdd3d1..dcc74734f6 100644
--- a/jscomp/core/js_of_lam_block.ml
+++ b/jscomp/core/js_of_lam_block.ml
@@ -51,15 +51,14 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args  =
 let field (field_info : Lam_compat.field_dbg_info) e i =
   match field_info with 
   | Fld_na 
-  | Fld_tuple ->
-    (* let comment = "NA" in *)
-    E.array_index_by_int (* ~comment *) e i 
-#if OCAML_VERSION =~ ">4.03.0" then 
-  | Fld_record_inline comment
-  | Fld_record_extension comment
+  | Fld_tuple
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content 
+  | Fld_record_inline _
+  | Fld_record_extension _
     -> 
-    E.array_index_by_int  ~comment e i 
-#end
+    E.array_index_by_int  
+      ?comment:(Lam_compat.str_of_field_info field_info) e i 
   | Fld_record {name}
     -> E.record_access e name i
   | Fld_module name
diff --git a/jscomp/core/lam_compat.ml b/jscomp/core/lam_compat.ml
index e582f0e2cd..785dba3db1 100644
--- a/jscomp/core/lam_compat.ml
+++ b/jscomp/core/lam_compat.ml
@@ -191,10 +191,16 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
 #end  
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
+
 let str_of_field_info (x : field_dbg_info) : string option =  
   match x with 
   | Fld_na 
-  | Fld_tuple -> None 
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content
+  | Fld_tuple -> None   
   | Fld_record {name = s} 
   | Fld_module s 
   | Fld_record_inline s 
diff --git a/jscomp/core/lam_compat.mli b/jscomp/core/lam_compat.mli
index f49b8fdf74..c9155ad4e9 100644
--- a/jscomp/core/lam_compat.mli
+++ b/jscomp/core/lam_compat.mli
@@ -92,6 +92,9 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
 #end  
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
   
 val str_of_field_info : 
   field_dbg_info -> 
diff --git a/jscomp/core/lam_compile_util.ml b/jscomp/core/lam_compile_util.ml
index 9a22841657..6b51789675 100644
--- a/jscomp/core/lam_compile_util.ml
+++ b/jscomp/core/lam_compile_util.ml
@@ -59,9 +59,11 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
   | Blk_extension (* TODO: enhance it later *)
   | Blk_extension_slot -> None
   | Blk_na s -> if s = "" then None else Some s
+
+let module_alias = Some "alias"  
 let comment_of_pointer_info (x :  Lam_pointer_info.t)= 
   match x with 
   | Pt_constructor {name}
   | Pt_variant {name} -> Some name
-  | Pt_module_alias -> None (* FIXME *)
+  | Pt_module_alias -> module_alias
   | Pt_na -> None
diff --git a/jscomp/test/array_data_util.js b/jscomp/test/array_data_util.js
index c2cdedf743..dc8ea19514 100644
--- a/jscomp/test/array_data_util.js
+++ b/jscomp/test/array_data_util.js
@@ -16,7 +16,7 @@ function randomRange(i, j) {
   return v;
 }
 
-var A = 0;
+var A = /* alias */0;
 
 exports.A = A;
 exports.range = range;
diff --git a/jscomp/test/bigarray_test.js b/jscomp/test/bigarray_test.js
index cb8363db8b..e9b53e3699 100644
--- a/jscomp/test/bigarray_test.js
+++ b/jscomp/test/bigarray_test.js
@@ -35,7 +35,7 @@ function init3(v) {
   return /* () */0;
 }
 
-var BA1 = 0;
+var BA1 = /* alias */0;
 
 exports.BA1 = BA1;
 exports.sum = sum;
diff --git a/jscomp/test/bs_MapInt_test.js b/jscomp/test/bs_MapInt_test.js
index dc6e35ac4e..942719cfe2 100644
--- a/jscomp/test/bs_MapInt_test.js
+++ b/jscomp/test/bs_MapInt_test.js
@@ -26,7 +26,7 @@ function test(param) {
 
 test(/* () */0);
 
-var M = 0;
+var M = /* alias */0;
 
 exports.should = should;
 exports.M = M;
diff --git a/jscomp/test/bs_array_test.js b/jscomp/test/bs_array_test.js
index 34cdd92fe2..7a485a592f 100644
--- a/jscomp/test/bs_array_test.js
+++ b/jscomp/test/bs_array_test.js
@@ -1586,9 +1586,9 @@ eq("File \"bs_array_test.ml\", line 339, characters 5-12", Belt_Array.getIndexBy
 
 Mt.from_pair_suites("File \"bs_array_test.ml\", line 341, characters 23-30", suites.contents);
 
-var A = 0;
+var A = /* alias */0;
 
-var L = 0;
+var L = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_float_test.js b/jscomp/test/bs_float_test.js
index 485437ee9a..27d94df219 100644
--- a/jscomp/test/bs_float_test.js
+++ b/jscomp/test/bs_float_test.js
@@ -87,7 +87,7 @@ eq("File \"bs_float_test.ml\", line 44, characters 5-12", 3.0 / 2.0, 1.5);
 
 Mt.from_pair_suites("File \"bs_float_test.ml\", line 46, characters 23-30", suites.contents);
 
-var F = 0;
+var F = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_hashmap_test.js b/jscomp/test/bs_hashmap_test.js
index b7966b0020..c25c566506 100644
--- a/jscomp/test/bs_hashmap_test.js
+++ b/jscomp/test/bs_hashmap_test.js
@@ -101,17 +101,17 @@ b("File \"bs_hashmap_test.ml\", line 57, characters 4-11", Belt_Array.every(Arra
 
 Mt.from_pair_suites("Bs_hashmap_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
 var $plus$plus = Belt_Array.concat;
 
-var A = 0;
+var A = /* alias */0;
 
-var So = 0;
+var So = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_hashset_int_test.js b/jscomp/test/bs_hashset_int_test.js
index c408bbb7db..bd3bffb752 100644
--- a/jscomp/test/bs_hashset_int_test.js
+++ b/jscomp/test/bs_hashset_int_test.js
@@ -105,17 +105,17 @@ b("File \"bs_hashset_int_test.ml\", line 62, characters 4-11", histo.length <= 1
 
 Mt.from_pair_suites("Bs_hashset_int_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
 var $plus$plus = Belt_Array.concat;
 
-var A = 0;
+var A = /* alias */0;
 
-var SI = 0;
+var SI = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/bs_hashtbl_string_test.js
index 8bdd0c6596..e79485c0af 100644
--- a/jscomp/test/bs_hashtbl_string_test.js
+++ b/jscomp/test/bs_hashtbl_string_test.js
@@ -297,25 +297,25 @@ bench7(/* () */0);
 
 console.timeEnd("test/bs_hashtbl_string_test.ml 203");
 
-var N = 0;
+var N = /* alias */0;
 
 var count = 1000000;
 
 var initial_size = 1000000;
 
-var M = 0;
+var M = /* alias */0;
 
-var Md = 0;
+var Md = /* alias */0;
 
-var Md0 = 0;
+var Md0 = /* alias */0;
 
-var H = 0;
+var H = /* alias */0;
 
-var H0 = 0;
+var H0 = /* alias */0;
 
-var HI = 0;
+var HI = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
 exports.hash_string = hash_string;
 exports.hashString = hashString;
diff --git a/jscomp/test/bs_int_test.js b/jscomp/test/bs_int_test.js
index e5d749ed36..2c2fc28b3b 100644
--- a/jscomp/test/bs_int_test.js
+++ b/jscomp/test/bs_int_test.js
@@ -85,7 +85,7 @@ eq("File \"bs_int_test.ml\", line 43, characters 5-12", 0, 0);
 
 Mt.from_pair_suites("File \"bs_int_test.ml\", line 45, characters 23-30", suites.contents);
 
-var I = 0;
+var I = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_list_test.js b/jscomp/test/bs_list_test.js
index f3c9c79ac8..a455990b12 100644
--- a/jscomp/test/bs_list_test.js
+++ b/jscomp/test/bs_list_test.js
@@ -2517,11 +2517,11 @@ b("File \"bs_list_test.ml\", line 349, characters 4-11", Belt_List.keepMap(/* ::
 
 Mt.from_pair_suites("Bs_list_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var J = 0;
+var J = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/bs_map_set_dict_test.js
index d3b0dd34ca..28f37a6127 100644
--- a/jscomp/test/bs_map_set_dict_test.js
+++ b/jscomp/test/bs_map_set_dict_test.js
@@ -155,25 +155,25 @@ eq("File \"bs_map_set_dict_test.ml\", line 94, characters 4-11", Belt_Array.make
 
 Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents);
 
-var M = 0;
+var M = /* alias */0;
 
-var MI = 0;
+var MI = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var L = 0;
+var L = /* alias */0;
 
 var vv = Belt_MapInt.empty;
 
 var vv2 = Belt_MapInt.empty;
 
-var Md0 = 0;
+var Md0 = /* alias */0;
 
-var ISet = 0;
+var ISet = /* alias */0;
 
-var S0 = 0;
+var S0 = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js
index c7cee7f443..caa0ed2f76 100644
--- a/jscomp/test/bs_map_test.js
+++ b/jscomp/test/bs_map_test.js
@@ -76,11 +76,11 @@ Belt_MapInt.checkInvariantInternal(xx);
 
 Mt.from_pair_suites("Bs_map_test", suites.contents);
 
-var M = 0;
+var M = /* alias */0;
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_mutable_set_test.js b/jscomp/test/bs_mutable_set_test.js
index 0aab20bf5c..8637fe3a2d 100644
--- a/jscomp/test/bs_mutable_set_test.js
+++ b/jscomp/test/bs_mutable_set_test.js
@@ -822,15 +822,15 @@ b("File \"bs_mutable_set_test.ml\", line 317, characters 4-11", Belt_MutableSetI
 
 Mt.from_pair_suites("Bs_mutable_set_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
-var R = 0;
+var R = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var L = 0;
+var L = /* alias */0;
 
 var empty = Belt_MutableSetInt.make;
 
diff --git a/jscomp/test/bs_poly_map_test.js b/jscomp/test/bs_poly_map_test.js
index b5fbafaa69..07785b63dc 100644
--- a/jscomp/test/bs_poly_map_test.js
+++ b/jscomp/test/bs_poly_map_test.js
@@ -321,13 +321,13 @@ b("File \"bs_poly_map_test.ml\", line 139, characters 4-11", Belt_Array.eq(Belt_
 
 Mt.from_pair_suites("Bs_poly_map_test", suites.contents);
 
-var M = 0;
+var M = /* alias */0;
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/bs_poly_mutable_map_test.js
index 38807ba922..f4666814c5 100644
--- a/jscomp/test/bs_poly_mutable_map_test.js
+++ b/jscomp/test/bs_poly_mutable_map_test.js
@@ -77,13 +77,13 @@ b("File \"bs_poly_mutable_map_test.ml\", line 31, characters 6-13", Belt_Mutable
 
 Mt.from_pair_suites("Bs_poly_mutable_map_test", suites.contents);
 
-var M = 0;
+var M = /* alias */0;
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/bs_poly_mutable_set_test.js
index e179df6cc5..3febeaa632 100644
--- a/jscomp/test/bs_poly_mutable_set_test.js
+++ b/jscomp/test/bs_poly_mutable_set_test.js
@@ -327,13 +327,13 @@ Belt_List.forEach(/* :: */[
 
 Mt.from_pair_suites("Bs_poly_mutable_set_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var L = 0;
+var L = /* alias */0;
 
 var $plus$plus = Belt_MutableSet.union;
 
diff --git a/jscomp/test/bs_poly_set_test.js b/jscomp/test/bs_poly_set_test.js
index 31aa2c02a4..b88394c05d 100644
--- a/jscomp/test/bs_poly_set_test.js
+++ b/jscomp/test/bs_poly_set_test.js
@@ -416,17 +416,17 @@ b("File \"bs_poly_set_test.ml\", line 159, characters 4-11", !match$5[1]);
 
 Mt.from_pair_suites("Bs_poly_set_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var D = 0;
+var D = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
-var L = 0;
+var L = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js
index 97bf918773..47122a7792 100644
--- a/jscomp/test/bs_queue_test.js
+++ b/jscomp/test/bs_queue_test.js
@@ -1138,7 +1138,7 @@ b("File \"bs_queue_test.ml\", line 156, characters 4-11", q$8.length === 0);
 
 Mt.from_pair_suites("Bs_queue_test", suites.contents);
 
-var Q = 0;
+var Q = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_rbset_int_bench.js b/jscomp/test/bs_rbset_int_bench.js
index ad7b288d96..32edbde80d 100644
--- a/jscomp/test/bs_rbset_int_bench.js
+++ b/jscomp/test/bs_rbset_int_bench.js
@@ -52,7 +52,7 @@ console.timeEnd("test/bs_rbset_int_bench.ml 21");
 
 var count = 1000000;
 
-var V = 0;
+var V = /* alias */0;
 
 exports.count = count;
 exports.V = V;
diff --git a/jscomp/test/bs_set_bench.js b/jscomp/test/bs_set_bench.js
index 0c96b9a049..fd07cd1f91 100644
--- a/jscomp/test/bs_set_bench.js
+++ b/jscomp/test/bs_set_bench.js
@@ -52,7 +52,7 @@ console.timeEnd("test/bs_set_bench.ml 21");
 
 var count = 1000000;
 
-var N = 0;
+var N = /* alias */0;
 
 exports.count = count;
 exports.N = N;
diff --git a/jscomp/test/bs_set_int_test.js b/jscomp/test/bs_set_int_test.js
index 336caf8aa8..e7ae627bf4 100644
--- a/jscomp/test/bs_set_int_test.js
+++ b/jscomp/test/bs_set_int_test.js
@@ -372,11 +372,11 @@ eq("File \"bs_set_int_test.ml\", line 176, characters 5-12", Belt_SetInt.get(v$1
 
 Mt.from_pair_suites("Bs_set_int_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var I = 0;
+var I = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
 var ofA = Belt_SetInt.fromArray;
 
diff --git a/jscomp/test/bs_sort_test.js b/jscomp/test/bs_sort_test.js
index 9b195f57a7..fb06962474 100644
--- a/jscomp/test/bs_sort_test.js
+++ b/jscomp/test/bs_sort_test.js
@@ -411,15 +411,15 @@ eq("File \"bs_sort_test.ml\", line 143, characters 5-12", Belt_SortArray.strictl
 
 Mt.from_pair_suites("Bs_sort_test", suites.contents);
 
-var I = 0;
+var I = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
-var R = 0;
+var R = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var SI = 0;
+var SI = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/bs_stack_test.js b/jscomp/test/bs_stack_test.js
index d76995dbe1..462de2cf05 100644
--- a/jscomp/test/bs_stack_test.js
+++ b/jscomp/test/bs_stack_test.js
@@ -106,9 +106,9 @@ console.log(inOrder(test1));
 
 console.log(inOrder3(test1));
 
-var S = 0;
+var S = /* alias */0;
 
-var Q = 0;
+var Q = /* alias */0;
 
 exports.S = S;
 exports.Q = Q;
diff --git a/jscomp/test/floatarray_test.js b/jscomp/test/floatarray_test.js
index 271a3c011e..f028515573 100644
--- a/jscomp/test/floatarray_test.js
+++ b/jscomp/test/floatarray_test.js
@@ -35,7 +35,7 @@ eq("File \"floatarray_test.ml\", line 17, characters 5-12", /* tuple */[
 
 Mt.from_pair_suites("Floatarray_test", suites.contents);
 
-var K = 0;
+var K = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/global_module_alias_test.js b/jscomp/test/global_module_alias_test.js
index d5db717fd1..0be703da5c 100644
--- a/jscomp/test/global_module_alias_test.js
+++ b/jscomp/test/global_module_alias_test.js
@@ -141,17 +141,17 @@ eq("File \"global_module_alias_test.ml\", line 96, characters 5-12", v.contents,
 
 Mt.from_pair_suites("Global_module_alias_test", suites.contents);
 
-var A = 0;
+var A = /* alias */0;
 
-var B = 0;
+var B = /* alias */0;
 
-var C = 0;
+var C = /* alias */0;
 
-var D = 0;
+var D = /* alias */0;
 
-var E = 0;
+var E = /* alias */0;
 
-var F = 0;
+var F = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/gpr_2487.js b/jscomp/test/gpr_2487.js
index 19260fe2d8..45deb52b1e 100644
--- a/jscomp/test/gpr_2487.js
+++ b/jscomp/test/gpr_2487.js
@@ -14,7 +14,7 @@ var b = Belt_Array.eq(/* array */[
         return prim === prim$1;
       }));
 
-var A = 0;
+var A = /* alias */0;
 
 exports.A = A;
 exports.b = b;
diff --git a/jscomp/test/gpr_3154_test.js b/jscomp/test/gpr_3154_test.js
index 104fd5ea86..7dd8aa8d9b 100644
--- a/jscomp/test/gpr_3154_test.js
+++ b/jscomp/test/gpr_3154_test.js
@@ -40,7 +40,7 @@ eq("File \"gpr_3154_test.ml\", line 18, characters 5-12", Js_dict.get(d0, "foo")
 
 Mt.from_pair_suites("Gpr_3154_test", suites.contents);
 
-var J = 0;
+var J = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/gpr_3852_alias.js b/jscomp/test/gpr_3852_alias.js
index b99410b606..0035fed818 100644
--- a/jscomp/test/gpr_3852_alias.js
+++ b/jscomp/test/gpr_3852_alias.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var A = 0;
+var A = /* alias */0;
 
 exports.A = A;
 /* No side effect */
diff --git a/jscomp/test/gpr_3865.js b/jscomp/test/gpr_3865.js
index 4c6c2b9939..cb48ed3dbf 100644
--- a/jscomp/test/gpr_3865.js
+++ b/jscomp/test/gpr_3865.js
@@ -8,7 +8,7 @@ console.log(Gpr_3865_foo.$$return);
 
 console.log(Gpr_3865_foo.$$return);
 
-var F = 0;
+var F = /* alias */0;
 
 exports.F = F;
 exports.B = B;
diff --git a/jscomp/test/imm_map_bench.js b/jscomp/test/imm_map_bench.js
index 003e6a916c..6e652778a4 100644
--- a/jscomp/test/imm_map_bench.js
+++ b/jscomp/test/imm_map_bench.js
@@ -58,11 +58,11 @@ test2(/* () */0);
 
 console.timeEnd("test/imm_map_bench.ml 45");
 
-var A = 0;
+var A = /* alias */0;
 
 var count = 1000000;
 
-var M = 0;
+var M = /* alias */0;
 
 exports.A = A;
 exports.empty = empty;
diff --git a/jscomp/test/js_date_test.js b/jscomp/test/js_date_test.js
index 1f1730e223..f6fce97352 100644
--- a/jscomp/test/js_date_test.js
+++ b/jscomp/test/js_date_test.js
@@ -1027,7 +1027,7 @@ var suites = /* :: */[
 
 Mt.from_pair_suites("Js_date_test", suites);
 
-var N = 0;
+var N = /* alias */0;
 
 exports.N = N;
 exports.date = date;
diff --git a/jscomp/test/mario_game.js b/jscomp/test/mario_game.js
index 12d6408c74..3b769e00d6 100644
--- a/jscomp/test/mario_game.js
+++ b/jscomp/test/mario_game.js
@@ -3318,8 +3318,8 @@ window.onload = (function (param) {
   });
 
 var Main = {
-  Html: 0,
-  Pg: 0,
+  Html: /* alias */0,
+  Pg: /* alias */0,
   loadCount: loadCount,
   imgsToLoad: 4,
   level_width: 2400,
diff --git a/jscomp/test/module_alias_test.js b/jscomp/test/module_alias_test.js
index b62ea4ee7b..42dc607a0a 100644
--- a/jscomp/test/module_alias_test.js
+++ b/jscomp/test/module_alias_test.js
@@ -53,11 +53,11 @@ eq("File \"module_alias_test.ml\", line 30, characters 6-13", a, 3);
 
 Mt.from_pair_suites("Module_alias_test", suites.contents);
 
-var N = 0;
+var N = /* alias */0;
 
-var V = 0;
+var V = /* alias */0;
 
-var J = 0;
+var J = /* alias */0;
 
 exports.suites = suites;
 exports.test_id = test_id;
diff --git a/jscomp/test/nested_module_alias.js b/jscomp/test/nested_module_alias.js
index 516b031e67..aedee4c730 100644
--- a/jscomp/test/nested_module_alias.js
+++ b/jscomp/test/nested_module_alias.js
@@ -9,7 +9,7 @@ function v(x) {
         ];
 }
 
-var L = 0;
+var L = /* alias */0;
 
 exports.L = L;
 exports.v = v;
diff --git a/jscomp/test/option_repr_test.js b/jscomp/test/option_repr_test.js
index afee80d545..460e797e30 100644
--- a/jscomp/test/option_repr_test.js
+++ b/jscomp/test/option_repr_test.js
@@ -276,7 +276,7 @@ var f8 = Caml_option.some(undefined);
 
 var f9 = Caml_option.some(Caml_option.some(undefined));
 
-var N = 0;
+var N = /* alias */0;
 
 var none_arg = undefined;
 
diff --git a/jscomp/test/pr6726.js b/jscomp/test/pr6726.js
index 592a1625aa..efe0feb415 100644
--- a/jscomp/test/pr6726.js
+++ b/jscomp/test/pr6726.js
@@ -14,7 +14,7 @@ var ExtUnixAll = {
 };
 
 var ExtUnix = {
-  All: 0
+  All: /* alias */0
 };
 
 function test_endian_string(x) {
diff --git a/jscomp/test/single_module_alias.js b/jscomp/test/single_module_alias.js
index f7ea37d2e0..4bdd012fcc 100644
--- a/jscomp/test/single_module_alias.js
+++ b/jscomp/test/single_module_alias.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-var L = 0;
+var L = /* alias */0;
 
 exports.L = L;
 /* No side effect */
diff --git a/jscomp/test/string_runtime_test.js b/jscomp/test/string_runtime_test.js
index a99597bab3..5d3df14db6 100644
--- a/jscomp/test/string_runtime_test.js
+++ b/jscomp/test/string_runtime_test.js
@@ -69,9 +69,9 @@ var suites = /* :: */[
 
 Mt.from_pair_suites("String_runtime_test", suites);
 
-var S = 0;
+var S = /* alias */0;
 
-var B = 0;
+var B = /* alias */0;
 
 exports.S = S;
 exports.B = B;
diff --git a/jscomp/test/test_global_print.js b/jscomp/test/test_global_print.js
index 67927f8d78..7186869ad3 100644
--- a/jscomp/test/test_global_print.js
+++ b/jscomp/test/test_global_print.js
@@ -9,9 +9,9 @@ var X = {
   List: List
 };
 
-var Hashtbl = 0;
+var Hashtbl = /* alias */0;
 
-var V = 0;
+var V = /* alias */0;
 
 exports.X = X;
 exports.Hashtbl = Hashtbl;
diff --git a/jscomp/test/test_include.js b/jscomp/test/test_include.js
index c2d07b000a..b8057e80b0 100644
--- a/jscomp/test/test_include.js
+++ b/jscomp/test/test_include.js
@@ -22,23 +22,23 @@ var U = {
   v: Test_order.compare
 };
 
-var N = 0;
+var N = /* alias */0;
 
 var v = List.length;
 
-var N0 = 0;
+var N0 = /* alias */0;
 
-var N1 = 0;
+var N1 = /* alias */0;
 
-var N2 = 0;
+var N2 = /* alias */0;
 
-var N3 = 0;
+var N3 = /* alias */0;
 
-var N4 = 0;
+var N4 = /* alias */0;
 
-var N5 = 0;
+var N5 = /* alias */0;
 
-var N6 = 0;
+var N6 = /* alias */0;
 
 var length = List.length;
 
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
index 5224f306b7..77aaa6868b 100644
--- a/lib/4.06.1/unstable/js_compiler.ml
+++ b/lib/4.06.1/unstable/js_compiler.ml
@@ -35632,7 +35632,9 @@ type field_dbg_info =
   | Fld_record_inline of string 
   | Fld_record_extension of string 
   | Fld_tuple
-
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  
 val fld_record :
   (Types.label_description -> 
   field_dbg_info) ref
@@ -35952,6 +35954,7 @@ val make_key: lambda -> lambda option
 val const_unit: structured_constant
 val lambda_assert_false: lambda
 val lambda_unit: lambda
+val lambda_module_alias : lambda
 val name_lambda: let_kind -> lambda -> (Ident.t -> lambda) -> lambda
 val name_lambda_list: lambda list -> (lambda list -> lambda) -> lambda
 
@@ -36091,7 +36094,9 @@ type field_dbg_info =
   | Fld_record_inline of string   
   | Fld_record_extension of string 
   | Fld_tuple  
-
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  
 let fld_record = ref (fun (lbl : Types.label_description) ->
   Fld_record {name = lbl.lbl_name; mutable_flag = Mutable})
 
@@ -36379,6 +36384,7 @@ let const_unit = Const_pointer(0, Pt_na)
 
 let lambda_assert_false = Lconst (Const_pointer(0, Pt_constructor {name = "assert false"; cstrs = (1,0)}))  
 
+let lambda_module_alias = Lconst (Const_pointer(0, Pt_module_alias)) 
 
 let lambda_unit = Lconst const_unit
 
@@ -85943,6 +85949,9 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
   
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
   
 val str_of_field_info : 
   field_dbg_info -> 
@@ -86155,10 +86164,16 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
   
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
+
 let str_of_field_info (x : field_dbg_info) : string option =  
   match x with 
   | Fld_na 
-  | Fld_tuple -> None 
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content
+  | Fld_tuple -> None   
   | Fld_record {name = s} 
   | Fld_module s 
   | Fld_record_inline s 
@@ -94533,11 +94548,13 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
   | Blk_extension (* TODO: enhance it later *)
   | Blk_extension_slot -> None
   | Blk_na s -> if s = "" then None else Some s
+
+let module_alias = Some "alias"  
 let comment_of_pointer_info (x :  Lam_pointer_info.t)= 
   match x with 
   | Pt_constructor {name}
   | Pt_variant {name} -> Some name
-  | Pt_module_alias -> None (* FIXME *)
+  | Pt_module_alias -> module_alias
   | Pt_na -> None
 
 end
@@ -103687,7 +103704,7 @@ let make_variant_matching_nonconst p lab def ctx = function
       let def = make_default (matcher_variant_nonconst lab) def
       and ctx = filter_ctx p ctx in
       {pm=
-        {cases = []; args = (Lprim(Pfield (1, Fld_na), [arg], p.pat_loc), Alias) :: argl;
+        {cases = []; args = (Lprim(Pfield (1, Fld_poly_var_content), [arg], p.pat_loc), Alias) :: argl;
           default=def} ;
         ctx=ctx ;
         pat = normalize_pat p}
@@ -103891,7 +103908,7 @@ let make_tuple_matching loc arity def = function
       let rec make_args pos =
         if pos >= arity
         then argl
-        else (Lprim(Pfield (pos, Fld_na (* TODO: tuple *)), [arg], loc), Alias) :: make_args (pos + 1) in
+        else (Lprim(Pfield (pos, Fld_tuple), [arg], loc), Alias) :: make_args (pos + 1) in
       {cases = []; args = make_args 0 ;
         default=make_default (matcher_tuple arity) def}
 
@@ -104727,7 +104744,7 @@ let call_switcher_variant_constant loc fail arg int_lambda_list names =
 
 let call_switcher_variant_constr loc fail arg int_lambda_list names =
   let v = Ident.create "variant" in
-  Llet(Alias, Pgenval, v, Lprim(Pfield (0, Fld_na), [arg], loc),
+  Llet(Alias, Pgenval, v, Lprim(Pfield (0, Fld_poly_var_tag), [arg], loc),
        call_switcher loc
          fail (Lvar v) min_int max_int int_lambda_list names)
 
@@ -106992,7 +107009,7 @@ and transl_exp0 e =
   | Texp_new (cl, {Location.loc=loc}, _) ->
       Lapply{ap_should_be_tailcall=false;
              ap_loc=loc;
-             ap_func=Lprim(Pfield (0, Fld_na), [transl_class_path ~loc e.exp_env cl], loc);
+             ap_func=Lprim(Pfield (0, Fld_tuple), [transl_class_path ~loc e.exp_env cl], loc);
              ap_args=[lambda_unit];
              ap_inlined=Default_inline;
              ap_specialised=Default_specialise}
@@ -107544,7 +107561,7 @@ let lfield v i = Lprim(Pfield (i, Fld_na), [Lvar v], Location.none)
 let transl_label l = share (Const_immstring l)
 
 let transl_meth_list lst =
-  if lst = [] then Lconst (Const_pointer (0, Lambda.Pt_na)) else
+  if lst = [] then Lconst (Const_pointer (0, Pt_na)) else
   share (Const_block
             (0, Lambda.Blk_array, List.map (fun lab -> Const_immstring lab) lst))
 
@@ -107755,8 +107772,8 @@ let rec build_class_init cla cstr super inh_init cl_init msubst top cl =
           let lpath = transl_class_path ~loc:cl.cl_loc cl.cl_env path in
           (inh_init,
            Llet (Strict, Pgenval, obj_init,
-                 mkappl(Lprim(Pfield (1, Fld_na), [lpath], Location.none), Lvar cla ::
-                        if top then [Lprim(Pfield (3, Fld_na), [lpath], Location.none)]
+                 mkappl(Lprim(Pfield (1, Fld_tuple), [lpath], Location.none), Lvar cla ::
+                        if top then [Lprim(Pfield (3, Fld_tuple), [lpath], Location.none)]
                         else []),
                  bind_super cla super cl_init))
       | _ ->
@@ -108012,7 +108029,7 @@ let rec builtin_meths self env env2 body =
     | Lprim(Parrayrefu _, [Lvar s; Lvar n], _) when List.mem s self ->
         "var", [Lvar n]
     | Lprim(Pfield (n,_), [Lvar e], _) when Ident.same e env ->
-        "env", [Lvar env2; Lconst(Const_pointer (n, Lambda.Pt_na))]
+        "env", [Lvar env2; Lconst(Const_pointer (n, Pt_na))]
     | Lsend(Self, met, Lvar s, [], _) when List.mem s self ->
         "meth", [met]
     | _ -> raise Not_found
@@ -108083,7 +108100,7 @@ module M = struct
     | "send_env"   -> SendEnv
     | "send_meth"  -> SendMeth
     | _ -> assert false
-    in Lconst(Const_pointer(Obj.magic tag, Lambda.Pt_na)) :: args
+    in Lconst(Const_pointer(Obj.magic tag, Pt_na)) :: args
 end
 open M
 
@@ -108917,7 +108934,7 @@ and transl_module cc rootpath mexp =
     mexp.mod_attributes;
   let loc = mexp.mod_loc in
   match mexp.mod_type with
-    Mty_alias (Mta_absent, _) -> apply_coercion loc Alias cc lambda_unit
+    Mty_alias (Mta_absent, _) -> apply_coercion loc Alias cc lambda_module_alias
   | _ ->
       match mexp.mod_desc with
         Tmod_ident (path,_) ->
@@ -116430,15 +116447,14 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args  =
 let field (field_info : Lam_compat.field_dbg_info) e i =
   match field_info with 
   | Fld_na 
-  | Fld_tuple ->
-    (* let comment = "NA" in *)
-    E.array_index_by_int (* ~comment *) e i 
- 
-  | Fld_record_inline comment
-  | Fld_record_extension comment
+  | Fld_tuple
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content 
+  | Fld_record_inline _
+  | Fld_record_extension _
     -> 
-    E.array_index_by_int  ~comment e i 
-
+    E.array_index_by_int  
+      ?comment:(Lam_compat.str_of_field_info field_info) e i 
   | Fld_record {name}
     -> E.record_access e name i
   | Fld_module name
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
index f954d0562d..c4416ebb64 100644
--- a/lib/4.06.1/whole_compiler.ml
+++ b/lib/4.06.1/whole_compiler.ml
@@ -20313,7 +20313,9 @@ type field_dbg_info =
   | Fld_record_inline of string 
   | Fld_record_extension of string 
   | Fld_tuple
-
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  
 val fld_record :
   (Types.label_description -> 
   field_dbg_info) ref
@@ -20633,6 +20635,7 @@ val make_key: lambda -> lambda option
 val const_unit: structured_constant
 val lambda_assert_false: lambda
 val lambda_unit: lambda
+val lambda_module_alias : lambda
 val name_lambda: let_kind -> lambda -> (Ident.t -> lambda) -> lambda
 val name_lambda_list: lambda list -> (lambda list -> lambda) -> lambda
 
@@ -20772,7 +20775,9 @@ type field_dbg_info =
   | Fld_record_inline of string   
   | Fld_record_extension of string 
   | Fld_tuple  
-
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  
 let fld_record = ref (fun (lbl : Types.label_description) ->
   Fld_record {name = lbl.lbl_name; mutable_flag = Mutable})
 
@@ -21060,6 +21065,7 @@ let const_unit = Const_pointer(0, Pt_na)
 
 let lambda_assert_false = Lconst (Const_pointer(0, Pt_constructor {name = "assert false"; cstrs = (1,0)}))  
 
+let lambda_module_alias = Lconst (Const_pointer(0, Pt_module_alias)) 
 
 let lambda_unit = Lconst const_unit
 
@@ -78249,6 +78255,9 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
   
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
   
 val str_of_field_info : 
   field_dbg_info -> 
@@ -78461,10 +78470,16 @@ type field_dbg_info = Lambda.field_dbg_info =
   | Fld_record_extension of string 
   
   | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+
+
 let str_of_field_info (x : field_dbg_info) : string option =  
   match x with 
   | Fld_na 
-  | Fld_tuple -> None 
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content
+  | Fld_tuple -> None   
   | Fld_record {name = s} 
   | Fld_module s 
   | Fld_record_inline s 
@@ -85456,11 +85471,13 @@ let comment_of_tag_info  (x : Lam_tag_info.t) =
   | Blk_extension (* TODO: enhance it later *)
   | Blk_extension_slot -> None
   | Blk_na s -> if s = "" then None else Some s
+
+let module_alias = Some "alias"  
 let comment_of_pointer_info (x :  Lam_pointer_info.t)= 
   match x with 
   | Pt_constructor {name}
   | Pt_variant {name} -> Some name
-  | Pt_module_alias -> None (* FIXME *)
+  | Pt_module_alias -> module_alias
   | Pt_na -> None
 
 end
@@ -91830,7 +91847,7 @@ let make_variant_matching_nonconst p lab def ctx = function
       let def = make_default (matcher_variant_nonconst lab) def
       and ctx = filter_ctx p ctx in
       {pm=
-        {cases = []; args = (Lprim(Pfield (1, Fld_na), [arg], p.pat_loc), Alias) :: argl;
+        {cases = []; args = (Lprim(Pfield (1, Fld_poly_var_content), [arg], p.pat_loc), Alias) :: argl;
           default=def} ;
         ctx=ctx ;
         pat = normalize_pat p}
@@ -92034,7 +92051,7 @@ let make_tuple_matching loc arity def = function
       let rec make_args pos =
         if pos >= arity
         then argl
-        else (Lprim(Pfield (pos, Fld_na (* TODO: tuple *)), [arg], loc), Alias) :: make_args (pos + 1) in
+        else (Lprim(Pfield (pos, Fld_tuple), [arg], loc), Alias) :: make_args (pos + 1) in
       {cases = []; args = make_args 0 ;
         default=make_default (matcher_tuple arity) def}
 
@@ -92870,7 +92887,7 @@ let call_switcher_variant_constant loc fail arg int_lambda_list names =
 
 let call_switcher_variant_constr loc fail arg int_lambda_list names =
   let v = Ident.create "variant" in
-  Llet(Alias, Pgenval, v, Lprim(Pfield (0, Fld_na), [arg], loc),
+  Llet(Alias, Pgenval, v, Lprim(Pfield (0, Fld_poly_var_tag), [arg], loc),
        call_switcher loc
          fail (Lvar v) min_int max_int int_lambda_list names)
 
@@ -95135,7 +95152,7 @@ and transl_exp0 e =
   | Texp_new (cl, {Location.loc=loc}, _) ->
       Lapply{ap_should_be_tailcall=false;
              ap_loc=loc;
-             ap_func=Lprim(Pfield (0, Fld_na), [transl_class_path ~loc e.exp_env cl], loc);
+             ap_func=Lprim(Pfield (0, Fld_tuple), [transl_class_path ~loc e.exp_env cl], loc);
              ap_args=[lambda_unit];
              ap_inlined=Default_inline;
              ap_specialised=Default_specialise}
@@ -95687,7 +95704,7 @@ let lfield v i = Lprim(Pfield (i, Fld_na), [Lvar v], Location.none)
 let transl_label l = share (Const_immstring l)
 
 let transl_meth_list lst =
-  if lst = [] then Lconst (Const_pointer (0, Lambda.Pt_na)) else
+  if lst = [] then Lconst (Const_pointer (0, Pt_na)) else
   share (Const_block
             (0, Lambda.Blk_array, List.map (fun lab -> Const_immstring lab) lst))
 
@@ -95898,8 +95915,8 @@ let rec build_class_init cla cstr super inh_init cl_init msubst top cl =
           let lpath = transl_class_path ~loc:cl.cl_loc cl.cl_env path in
           (inh_init,
            Llet (Strict, Pgenval, obj_init,
-                 mkappl(Lprim(Pfield (1, Fld_na), [lpath], Location.none), Lvar cla ::
-                        if top then [Lprim(Pfield (3, Fld_na), [lpath], Location.none)]
+                 mkappl(Lprim(Pfield (1, Fld_tuple), [lpath], Location.none), Lvar cla ::
+                        if top then [Lprim(Pfield (3, Fld_tuple), [lpath], Location.none)]
                         else []),
                  bind_super cla super cl_init))
       | _ ->
@@ -96155,7 +96172,7 @@ let rec builtin_meths self env env2 body =
     | Lprim(Parrayrefu _, [Lvar s; Lvar n], _) when List.mem s self ->
         "var", [Lvar n]
     | Lprim(Pfield (n,_), [Lvar e], _) when Ident.same e env ->
-        "env", [Lvar env2; Lconst(Const_pointer (n, Lambda.Pt_na))]
+        "env", [Lvar env2; Lconst(Const_pointer (n, Pt_na))]
     | Lsend(Self, met, Lvar s, [], _) when List.mem s self ->
         "meth", [met]
     | _ -> raise Not_found
@@ -96226,7 +96243,7 @@ module M = struct
     | "send_env"   -> SendEnv
     | "send_meth"  -> SendMeth
     | _ -> assert false
-    in Lconst(Const_pointer(Obj.magic tag, Lambda.Pt_na)) :: args
+    in Lconst(Const_pointer(Obj.magic tag, Pt_na)) :: args
 end
 open M
 
@@ -97060,7 +97077,7 @@ and transl_module cc rootpath mexp =
     mexp.mod_attributes;
   let loc = mexp.mod_loc in
   match mexp.mod_type with
-    Mty_alias (Mta_absent, _) -> apply_coercion loc Alias cc lambda_unit
+    Mty_alias (Mta_absent, _) -> apply_coercion loc Alias cc lambda_module_alias
   | _ ->
       match mexp.mod_desc with
         Tmod_ident (path,_) ->
@@ -107909,15 +107926,14 @@ let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args  =
 let field (field_info : Lam_compat.field_dbg_info) e i =
   match field_info with 
   | Fld_na 
-  | Fld_tuple ->
-    (* let comment = "NA" in *)
-    E.array_index_by_int (* ~comment *) e i 
- 
-  | Fld_record_inline comment
-  | Fld_record_extension comment
+  | Fld_tuple
+  | Fld_poly_var_tag 
+  | Fld_poly_var_content 
+  | Fld_record_inline _
+  | Fld_record_extension _
     -> 
-    E.array_index_by_int  ~comment e i 
-
+    E.array_index_by_int  
+      ?comment:(Lam_compat.str_of_field_info field_info) e i 
   | Fld_record {name}
     -> E.record_access e name i
   | Fld_module name
diff --git a/lib/js/belt.js b/lib/js/belt.js
index 5bfd498848..87e884089c 100644
--- a/lib/js/belt.js
+++ b/lib/js/belt.js
@@ -1,41 +1,41 @@
 'use strict';
 
 
-var Id = 0;
+var Id = /* alias */0;
 
-var $$Array = 0;
+var $$Array = /* alias */0;
 
-var SortArray = 0;
+var SortArray = /* alias */0;
 
-var MutableQueue = 0;
+var MutableQueue = /* alias */0;
 
-var MutableStack = 0;
+var MutableStack = /* alias */0;
 
-var List = 0;
+var List = /* alias */0;
 
-var $$Range = 0;
+var $$Range = /* alias */0;
 
-var $$Set = 0;
+var $$Set = /* alias */0;
 
-var $$Map = 0;
+var $$Map = /* alias */0;
 
-var MutableSet = 0;
+var MutableSet = /* alias */0;
 
-var MutableMap = 0;
+var MutableMap = /* alias */0;
 
-var HashSet = 0;
+var HashSet = /* alias */0;
 
-var HashMap = 0;
+var HashMap = /* alias */0;
 
-var $$Option = 0;
+var $$Option = /* alias */0;
 
-var Result = 0;
+var Result = /* alias */0;
 
-var Int = 0;
+var Int = /* alias */0;
 
-var Float = 0;
+var Float = /* alias */0;
 
-var Debug = 0;
+var Debug = /* alias */0;
 
 exports.Id = Id;
 exports.$$Array = $$Array;
diff --git a/lib/js/belt_HashMap.js b/lib/js/belt_HashMap.js
index 56f1cb874b..e31dc24733 100644
--- a/lib/js/belt_HashMap.js
+++ b/lib/js/belt_HashMap.js
@@ -244,9 +244,9 @@ function mergeMany(h, arr) {
   return /* () */0;
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 var clear = Belt_internalBucketsType.clear;
 
diff --git a/lib/js/belt_HashSet.js b/lib/js/belt_HashSet.js
index 6c6ed2e928..795ca2b639 100644
--- a/lib/js/belt_HashSet.js
+++ b/lib/js/belt_HashSet.js
@@ -190,9 +190,9 @@ function mergeMany(h, arr) {
   return /* () */0;
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 var clear = Belt_internalBucketsType.clear;
 
diff --git a/lib/js/belt_Map.js b/lib/js/belt_Map.js
index bc5ce00a1a..375a71e63b 100644
--- a/lib/js/belt_Map.js
+++ b/lib/js/belt_Map.js
@@ -307,11 +307,11 @@ function packIdData(id, data) {
         };
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
-var Dict = 0;
+var Dict = /* alias */0;
 
 exports.Int = Int;
 exports.$$String = $$String;
diff --git a/lib/js/belt_MutableMap.js b/lib/js/belt_MutableMap.js
index 2311a6d653..04ab64d143 100644
--- a/lib/js/belt_MutableMap.js
+++ b/lib/js/belt_MutableMap.js
@@ -355,9 +355,9 @@ function mergeMany(d, xs) {
   }
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 exports.Int = Int;
 exports.$$String = $$String;
diff --git a/lib/js/belt_MutableSet.js b/lib/js/belt_MutableSet.js
index 64f11c3ee6..e137bbba0f 100644
--- a/lib/js/belt_MutableSet.js
+++ b/lib/js/belt_MutableSet.js
@@ -506,9 +506,9 @@ function copy(d) {
         };
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 exports.Int = Int;
 exports.$$String = $$String;
diff --git a/lib/js/belt_Set.js b/lib/js/belt_Set.js
index 55f4cde362..1a84dc90bf 100644
--- a/lib/js/belt_Set.js
+++ b/lib/js/belt_Set.js
@@ -258,11 +258,11 @@ function checkInvariantInternal(d) {
   return Belt_SetDict.checkInvariantInternal(d.data);
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
-var Dict = 0;
+var Dict = /* alias */0;
 
 exports.Int = Int;
 exports.$$String = $$String;
diff --git a/lib/js/belt_SortArray.js b/lib/js/belt_SortArray.js
index 24a945962b..c141984248 100644
--- a/lib/js/belt_SortArray.js
+++ b/lib/js/belt_SortArray.js
@@ -426,9 +426,9 @@ function binarySearchBy(sorted, key, cmp) {
   return binarySearchByU(sorted, key, Curry.__2(cmp));
 }
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 exports.Int = Int;
 exports.$$String = $$String;
diff --git a/lib/js/belt_internalBuckets.js b/lib/js/belt_internalBuckets.js
index 3d15bfd939..6b8b74e614 100644
--- a/lib/js/belt_internalBuckets.js
+++ b/lib/js/belt_internalBuckets.js
@@ -279,7 +279,7 @@ function toArray(h) {
               }));
 }
 
-var C = 0;
+var C = /* alias */0;
 
 exports.C = C;
 exports.copy = copy;
diff --git a/lib/js/belt_internalMapInt.js b/lib/js/belt_internalMapInt.js
index 325bc27fc3..e9184185a4 100644
--- a/lib/js/belt_internalMapInt.js
+++ b/lib/js/belt_internalMapInt.js
@@ -349,11 +349,11 @@ function fromArray(xs) {
   }
 }
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
 exports.N = N;
 exports.A = A;
diff --git a/lib/js/belt_internalMapString.js b/lib/js/belt_internalMapString.js
index 26bb2db815..e3e7bccef1 100644
--- a/lib/js/belt_internalMapString.js
+++ b/lib/js/belt_internalMapString.js
@@ -349,11 +349,11 @@ function fromArray(xs) {
   }
 }
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
-var S = 0;
+var S = /* alias */0;
 
 exports.N = N;
 exports.A = A;
diff --git a/lib/js/belt_internalSetBuckets.js b/lib/js/belt_internalSetBuckets.js
index ac5176714a..f350f99fe0 100644
--- a/lib/js/belt_internalSetBuckets.js
+++ b/lib/js/belt_internalSetBuckets.js
@@ -183,7 +183,7 @@ function logStats(h) {
   return /* () */0;
 }
 
-var C = 0;
+var C = /* alias */0;
 
 exports.C = C;
 exports.copy = copy;
diff --git a/lib/js/belt_internalSetInt.js b/lib/js/belt_internalSetInt.js
index 188021088e..8eea01c135 100644
--- a/lib/js/belt_internalSetInt.js
+++ b/lib/js/belt_internalSetInt.js
@@ -193,11 +193,11 @@ function fromArray(xs) {
   }
 }
 
-var S = 0;
+var S = /* alias */0;
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
 exports.S = S;
 exports.N = N;
diff --git a/lib/js/belt_internalSetString.js b/lib/js/belt_internalSetString.js
index c87ca06761..abf75c8cb1 100644
--- a/lib/js/belt_internalSetString.js
+++ b/lib/js/belt_internalSetString.js
@@ -193,11 +193,11 @@ function fromArray(xs) {
   }
 }
 
-var S = 0;
+var S = /* alias */0;
 
-var N = 0;
+var N = /* alias */0;
 
-var A = 0;
+var A = /* alias */0;
 
 exports.S = S;
 exports.N = N;
diff --git a/lib/js/dom.js b/lib/js/dom.js
index a106fffcbb..e09e039082 100644
--- a/lib/js/dom.js
+++ b/lib/js/dom.js
@@ -1,9 +1,9 @@
 'use strict';
 
 
-var $$Storage = 0;
+var $$Storage = /* alias */0;
 
-var Storage2 = 0;
+var Storage2 = /* alias */0;
 
 exports.$$Storage = $$Storage;
 exports.Storage2 = Storage2;
diff --git a/lib/js/js.js b/lib/js/js.js
index b6ab3e5122..2ef1d23297 100644
--- a/lib/js/js.js
+++ b/lib/js/js.js
@@ -3,61 +3,61 @@
 
 var Internal = { };
 
-var MapperRt = 0;
+var MapperRt = /* alias */0;
 
-var Null = 0;
+var Null = /* alias */0;
 
-var Undefined = 0;
+var Undefined = /* alias */0;
 
-var Nullable = 0;
+var Nullable = /* alias */0;
 
-var Null_undefined = 0;
+var Null_undefined = /* alias */0;
 
-var Exn = 0;
+var Exn = /* alias */0;
 
-var $$Array = 0;
+var $$Array = /* alias */0;
 
-var Array2 = 0;
+var Array2 = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
-var String2 = 0;
+var String2 = /* alias */0;
 
-var Re = 0;
+var Re = /* alias */0;
 
-var $$Promise = 0;
+var $$Promise = /* alias */0;
 
-var $$Date = 0;
+var $$Date = /* alias */0;
 
-var Dict = 0;
+var Dict = /* alias */0;
 
-var Global = 0;
+var Global = /* alias */0;
 
-var Json = 0;
+var Json = /* alias */0;
 
-var $$Math = 0;
+var $$Math = /* alias */0;
 
-var Obj = 0;
+var Obj = /* alias */0;
 
-var Typed_array = 0;
+var Typed_array = /* alias */0;
 
-var TypedArray2 = 0;
+var TypedArray2 = /* alias */0;
 
-var Types = 0;
+var Types = /* alias */0;
 
-var Float = 0;
+var Float = /* alias */0;
 
-var Int = 0;
+var Int = /* alias */0;
 
-var $$Option = 0;
+var $$Option = /* alias */0;
 
-var Result = 0;
+var Result = /* alias */0;
 
-var List = 0;
+var List = /* alias */0;
 
-var Vector = 0;
+var Vector = /* alias */0;
 
-var Console = 0;
+var Console = /* alias */0;
 
 exports.MapperRt = MapperRt;
 exports.Internal = Internal;
diff --git a/lib/js/js_typed_array.js b/lib/js/js_typed_array.js
index a9aaa32cc4..5a147c3248 100644
--- a/lib/js/js_typed_array.js
+++ b/lib/js/js_typed_array.js
@@ -23,11 +23,11 @@ var $$Float64Array = { };
 
 var $$DataView = { };
 
-var Int32_array = 0;
+var Int32_array = /* alias */0;
 
-var Float32_array = 0;
+var Float32_array = /* alias */0;
 
-var Float64_array = 0;
+var Float64_array = /* alias */0;
 
 exports.$$ArrayBuffer = $$ArrayBuffer;
 exports.$$Int8Array = $$Int8Array;
diff --git a/lib/js/node.js b/lib/js/node.js
index 295bea2403..8a07297f91 100644
--- a/lib/js/node.js
+++ b/lib/js/node.js
@@ -15,17 +15,17 @@ function test(x) {
   }
 }
 
-var Path = 0;
+var Path = /* alias */0;
 
-var Fs = 0;
+var Fs = /* alias */0;
 
-var Process = 0;
+var Process = /* alias */0;
 
-var Module = 0;
+var Module = /* alias */0;
 
-var $$Buffer = 0;
+var $$Buffer = /* alias */0;
 
-var Child_process = 0;
+var Child_process = /* alias */0;
 
 exports.Path = Path;
 exports.Fs = Fs;
diff --git a/lib/js/stdLabels.js b/lib/js/stdLabels.js
index 02d65bfedc..b5a4813250 100644
--- a/lib/js/stdLabels.js
+++ b/lib/js/stdLabels.js
@@ -1,13 +1,13 @@
 'use strict';
 
 
-var $$Array = 0;
+var $$Array = /* alias */0;
 
-var Bytes = 0;
+var Bytes = /* alias */0;
 
-var List = 0;
+var List = /* alias */0;
 
-var $$String = 0;
+var $$String = /* alias */0;
 
 exports.$$Array = $$Array;
 exports.Bytes = Bytes;
diff --git a/ocaml b/ocaml
index e18633036e..c8551a68a5 160000
--- a/ocaml
+++ b/ocaml
@@ -1 +1 @@
-Subproject commit e18633036ee4a69b1b71b5118899ec13b2f6396c
+Subproject commit c8551a68a57906ffcc5b28663fb53a92569b6235