@flock/wirespec 0.19.6 → 0.19.7

package/wirespec-src-compiler-core.mjs

@@ -64,6 +64,7 @@ import {
   startsWith1bgirhbedtv2y as startsWith_0,
   isInterface3d6p8outrmvmk as isInterface,
   initMetadataForCompanion1wyw17z38v6ac as initMetadataForCompanion,
+  getBooleanHashCode1bbj3u6b3v0a7 as getBooleanHashCode,
   emptyList1g2z5xcrvp2zy as emptyList,
   listOfvhqybd2zx248 as listOf_0,
   ArrayList_init_$Create$1jemgvhi5v0js as ArrayList_init_$Create$_0,
@@ -99,7 +100,6 @@ import {
   throwKotlinNothingValueException2lxmvl03dor6f as throwKotlinNothingValueException,
   toList3jhuyej2anx2q as toList,
   toSet2orjxp16sotqu as toSet,
-  getBooleanHashCode1bbj3u6b3v0a7 as getBooleanHashCode,
   checkBuilderCapacity1h6g02949wvv as checkBuilderCapacity,
   zipWithNext2nnv9puh4xyfv as zipWithNext,
   toString30pk9tzaqopn as toString_1,
@@ -141,7 +141,7 @@ function get_expression(_this__u8e3s4) {
 initMetadataForInterface(TypeDefinitionEmitter, 'TypeDefinitionEmitter');
 function emitClientEndpointRequest(_this__u8e3s4) {
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = _this__u8e3s4.rq_1;
+  var this_0 = _this__u8e3s4.sq_1;
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -149,7 +149,7 @@ function emitClientEndpointRequest(_this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    var list = new NonEmptyList(element.tq_1);
+    var list = new NonEmptyList(element.uq_1);
     addAll(destination, list);
   }
   var tmp$ret$3 = _NonEmptyList___init__impl__fxd0xp(destination);
@@ -170,21 +170,21 @@ function emitClientEndpointRequest(_this__u8e3s4) {
   var _iterator__ex2g4s_1 = destination_0.t();
   while (_iterator__ex2g4s_1.u()) {
     var item = _iterator__ex2g4s_1.v();
-    var tmp$ret$6 = new Pair(item, first(item.zp_1));
+    var tmp$ret$6 = new Pair(item, first(item.aq_1));
     destination_1.x(tmp$ret$6);
   }
   return destination_1;
 }
 initMetadataForInterface(ClientEmitter, 'ClientEmitter');
 function notYetImplemented() {
-  return this.vq() + ' TODO("Not yet implemented")\n';
+  return this.wq() + ' TODO("Not yet implemented")\n';
 }
 initMetadataForInterface(NotYetImplemented, 'NotYetImplemented');
 initMetadataForClass(ParamType, 'ParamType', VOID, Enum);
 initMetadataForClass(Param, 'Param');
 initMetadataForClass(FileExtension, 'FileExtension', VOID, Enum);
 initMetadataForCompanion(Companion_0);
-initMetadataForClass(LanguageEmitter, 'LanguageEmitter', VOID, VOID, [NotYetImplemented, TypeDefinitionEmitter]);
+initMetadataForClass(LanguageEmitter, 'LanguageEmitter', VOID, VOID, [TypeDefinitionEmitter, NotYetImplemented]);
 initMetadataForCompanion(Companion_1);
 initMetadataForClass(PackageName, 'PackageName');
 initMetadataForObject(Spacer, 'Spacer');
@@ -246,22 +246,22 @@ initMetadataForObject(Bytes, 'Bytes');
 function copy(isNullable) {
   var tmp;
   if (this instanceof Any) {
-    tmp = this.uu(isNullable == null ? this.ru_1 : isNullable);
+    tmp = this.vu(isNullable == null ? this.su_1 : isNullable);
   } else {
     if (this instanceof Custom) {
-      tmp = this.ev(VOID, isNullable == null ? this.cv_1 : isNullable);
+      tmp = this.fv(VOID, isNullable == null ? this.dv_1 : isNullable);
     } else {
       if (this instanceof Dict_0) {
-        tmp = this.zu(VOID, isNullable == null ? this.to_1 : isNullable);
+        tmp = this.av(VOID, isNullable == null ? this.to_1 : isNullable);
       } else {
         if (this instanceof Iterable) {
-          tmp = this.av(VOID, isNullable == null ? this.qo_1 : isNullable);
+          tmp = this.bv(VOID, isNullable == null ? this.qo_1 : isNullable);
         } else {
           if (this instanceof Primitive) {
-            tmp = this.jv(VOID, isNullable == null ? this.gv_1 : isNullable);
+            tmp = this.kv(VOID, isNullable == null ? this.hv_1 : isNullable);
           } else {
             if (this instanceof Unit) {
-              tmp = this.uu(isNullable == null ? this.wu_1 : isNullable);
+              tmp = this.vu(isNullable == null ? this.xu_1 : isNullable);
             } else {
               noWhenBranchMatchedException();
             }
@@ -720,16 +720,19 @@ protoOf(EmitShared).l1 = function () {
 protoOf(EmitShared).toString = function () {
   return this.xo_1.toString();
 };
-function Emitted(file, result) {
+function Emitted(file, result, test) {
+  test = test === VOID ? false : test;
   this.yo_1 = file;
   this.zo_1 = result;
+  this.ap_1 = test;
 }
 protoOf(Emitted).toString = function () {
-  return 'Emitted(file=' + this.yo_1 + ', result=' + this.zo_1 + ')';
+  return 'Emitted(file=' + this.yo_1 + ', result=' + this.zo_1 + ', test=' + this.ap_1 + ')';
 };
 protoOf(Emitted).hashCode = function () {
   var result = getStringHashCode(this.yo_1);
   result = imul(result, 31) + getStringHashCode(this.zo_1) | 0;
+  result = imul(result, 31) + getBooleanHashCode(this.ap_1) | 0;
   return result;
 };
 protoOf(Emitted).equals = function (other) {
@@ -741,13 +744,15 @@ protoOf(Emitted).equals = function (other) {
     return false;
   if (!(this.zo_1 === other.zo_1))
     return false;
+  if (!(this.ap_1 === other.ap_1))
+    return false;
   return true;
 };
 function importReferences(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Endpoint) {
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0 = _this__u8e3s4.wp_1;
+    var tmp0 = _this__u8e3s4.xp_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s = tmp0.t();
@@ -763,61 +768,61 @@ function importReferences(_this__u8e3s4) {
     var _iterator__ex2g4s_0 = destination.t();
     while (_iterator__ex2g4s_0.u()) {
       var item = _iterator__ex2g4s_0.v();
-      var tmp$ret$2 = item.cq_1;
+      var tmp$ret$2 = item.dq_1;
       destination_0.x(tmp$ret$2);
     }
     var tmp_0 = destination_0;
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.yp_1;
+    var this_0 = _this__u8e3s4.zp_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination_1 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_0, 10));
     var _iterator__ex2g4s_1 = this_0.t();
     while (_iterator__ex2g4s_1.u()) {
       var item_0 = _iterator__ex2g4s_1.v();
-      var tmp$ret$5 = item_0.rp_1;
+      var tmp$ret$5 = item_0.sp_1;
       destination_1.x(tmp$ret$5);
     }
     var tmp_1 = destination_1;
     // Inline function 'kotlin.collections.map' call
-    var this_1 = _this__u8e3s4.xp_1;
+    var this_1 = _this__u8e3s4.yp_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination_2 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_1, 10));
     var _iterator__ex2g4s_2 = this_1.t();
     while (_iterator__ex2g4s_2.u()) {
       var item_1 = _iterator__ex2g4s_2.v();
-      var tmp$ret$8 = item_1.rp_1;
+      var tmp$ret$8 = item_1.sp_1;
       destination_2.x(tmp$ret$8);
     }
     var tmp_2 = destination_2;
     // Inline function 'kotlin.collections.map' call
-    var this_2 = _this__u8e3s4.zp_1;
+    var this_2 = _this__u8e3s4.aq_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination_3 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_2, 10));
     var _iterator__ex2g4s_3 = this_2.t();
     while (_iterator__ex2g4s_3.u()) {
       var item_2 = _iterator__ex2g4s_3.v();
-      var tmp0_safe_receiver = item_2.dq_1;
-      var tmp$ret$11 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.fq_1;
+      var tmp0_safe_receiver = item_2.eq_1;
+      var tmp$ret$11 = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.gq_1;
       destination_3.x(tmp$ret$11);
     }
     var tmp_3 = destination_3;
     // Inline function 'kotlin.collections.flatMap' call
-    var tmp0_0 = _this__u8e3s4.aq_1;
+    var tmp0_0 = _this__u8e3s4.bq_1;
     // Inline function 'kotlin.collections.flatMapTo' call
     var destination_4 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_4 = tmp0_0.t();
     while (_iterator__ex2g4s_4.u()) {
       var element_0 = _iterator__ex2g4s_4.v();
-      var tmp0_safe_receiver_0 = element_0.iq_1;
-      var tmp_4 = listOf_0(tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.fq_1);
+      var tmp0_safe_receiver_0 = element_0.jq_1;
+      var tmp_4 = listOf_0(tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.gq_1);
       // Inline function 'kotlin.collections.map' call
-      var this_3 = element_0.hq_1;
+      var this_3 = element_0.iq_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination_5 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_3, 10));
       var _iterator__ex2g4s_5 = this_3.t();
       while (_iterator__ex2g4s_5.u()) {
         var item_3 = _iterator__ex2g4s_5.v();
-        var tmp$ret$14 = item_3.rp_1;
+        var tmp$ret$14 = item_3.sp_1;
         destination_5.x(tmp$ret$14);
       }
       var list = plus(tmp_4, destination_5);
@@ -847,13 +852,13 @@ function importReferences(_this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Type) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0_1 = _this__u8e3s4.mp_1.ip_1;
+      var tmp0_1 = _this__u8e3s4.np_1.jp_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination_8 = ArrayList_init_$Create$_0();
       var _iterator__ex2g4s_8 = tmp0_1.t();
       while (_iterator__ex2g4s_8.u()) {
         var element_2 = _iterator__ex2g4s_8.v();
-        if (!(_this__u8e3s4.lp_1.l1() === root(element_2.rp_1).l1())) {
+        if (!(_this__u8e3s4.mp_1.l1() === root(element_2.sp_1).l1())) {
           destination_8.x(element_2);
         }
       }
@@ -863,7 +868,7 @@ function importReferences(_this__u8e3s4) {
       var _iterator__ex2g4s_9 = destination_8.t();
       while (_iterator__ex2g4s_9.u()) {
         var item_5 = _iterator__ex2g4s_9.v();
-        var tmp$ret$28 = flattenListDict(item_5.rp_1);
+        var tmp$ret$28 = flattenListDict(item_5.sp_1);
         destination_9.x(tmp$ret$28);
       }
       // Inline function 'kotlin.collections.filterIsInstance' call
@@ -880,7 +885,7 @@ function importReferences(_this__u8e3s4) {
     } else {
       if (_this__u8e3s4 instanceof Union) {
         // Inline function 'kotlin.collections.filterIsInstance' call
-        var tmp0_2 = _this__u8e3s4.hp_1;
+        var tmp0_2 = _this__u8e3s4.ip_1;
         // Inline function 'kotlin.collections.filterIsInstanceTo' call
         var destination_11 = ArrayList_init_$Create$_0();
         var _iterator__ex2g4s_11 = tmp0_2.t();
@@ -894,9 +899,9 @@ function importReferences(_this__u8e3s4) {
       } else {
         if (_this__u8e3s4 instanceof Channel) {
           var tmp_5;
-          var tmp_6 = _this__u8e3s4.dp_1;
+          var tmp_6 = _this__u8e3s4.ep_1;
           if (tmp_6 instanceof Custom) {
-            tmp_5 = listOf_0(_this__u8e3s4.dp_1);
+            tmp_5 = listOf_0(_this__u8e3s4.ep_1);
           } else {
             tmp_5 = emptyList();
           }
@@ -925,7 +930,7 @@ function NotYetImplemented() {
 }
 function get_pathParams(_this__u8e3s4) {
   // Inline function 'kotlin.collections.filterIsInstance' call
-  var tmp0 = _this__u8e3s4.wp_1;
+  var tmp0 = _this__u8e3s4.xp_1;
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.t();
@@ -944,7 +949,7 @@ function distinctByStatus(_this__u8e3s4) {
   var _iterator__ex2g4s = _this__u8e3s4.t();
   while (_iterator__ex2g4s.u()) {
     var e = _iterator__ex2g4s.v();
-    var key = e.gq_1;
+    var key = e.hq_1;
     if (set.x(key)) {
       list.x(e);
     }
@@ -954,10 +959,10 @@ function distinctByStatus(_this__u8e3s4) {
 function emit_0(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Literal) {
-    tmp = _this__u8e3s4.xq_1;
+    tmp = _this__u8e3s4.yq_1;
   } else {
     if (_this__u8e3s4 instanceof Param_0) {
-      tmp = '{' + _this__u8e3s4.bq_1.l1() + '}';
+      tmp = '{' + _this__u8e3s4.cq_1.l1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -969,7 +974,7 @@ function fixStatus(_this__u8e3s4) {
 }
 function get_indexedPathParams(_this__u8e3s4) {
   // Inline function 'kotlin.collections.mapNotNull' call
-  var tmp0 = withIndex(_this__u8e3s4.wp_1);
+  var tmp0 = withIndex(_this__u8e3s4.xp_1);
   // Inline function 'kotlin.collections.mapNotNullTo' call
   var destination = ArrayList_init_$Create$_0();
   // Inline function 'kotlin.collections.forEach' call
@@ -1000,7 +1005,7 @@ function get_indexedPathParams(_this__u8e3s4) {
 }
 function hasEndpoints(_this__u8e3s4) {
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = _this__u8e3s4.rq_1;
+  var this_0 = _this__u8e3s4.sq_1;
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -1008,7 +1013,7 @@ function hasEndpoints(_this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    var list = new NonEmptyList(element.tq_1);
+    var list = new NonEmptyList(element.uq_1);
     addAll(destination, list);
   }
   var tmp$ret$3 = _NonEmptyList___init__impl__fxd0xp(destination);
@@ -1072,17 +1077,17 @@ function ParamType_BODY_getInstance() {
   return ParamType_BODY_instance;
 }
 function Param(type, identifier, reference) {
-  this.yq_1 = type;
-  this.zq_1 = identifier;
-  this.ar_1 = reference;
+  this.zq_1 = type;
+  this.ar_1 = identifier;
+  this.br_1 = reference;
 }
 protoOf(Param).toString = function () {
-  return 'Param(type=' + this.yq_1.toString() + ', identifier=' + this.zq_1.toString() + ', reference=' + toString(this.ar_1) + ')';
+  return 'Param(type=' + this.zq_1.toString() + ', identifier=' + this.ar_1.toString() + ', reference=' + toString(this.br_1) + ')';
 };
 protoOf(Param).hashCode = function () {
-  var result = this.yq_1.hashCode();
-  result = imul(result, 31) + hashCode(this.zq_1) | 0;
+  var result = this.zq_1.hashCode();
   result = imul(result, 31) + hashCode(this.ar_1) | 0;
+  result = imul(result, 31) + hashCode(this.br_1) | 0;
   return result;
 };
 protoOf(Param).equals = function (other) {
@@ -1090,12 +1095,12 @@ protoOf(Param).equals = function (other) {
     return true;
   if (!(other instanceof Param))
     return false;
-  if (!this.yq_1.equals(other.yq_1))
-    return false;
-  if (!equals(this.zq_1, other.zq_1))
+  if (!this.zq_1.equals(other.zq_1))
     return false;
   if (!equals(this.ar_1, other.ar_1))
     return false;
+  if (!equals(this.br_1, other.br_1))
+    return false;
   return true;
 };
 function paramList(_this__u8e3s4, endpoint) {
@@ -1111,7 +1116,7 @@ function paramList(_this__u8e3s4, endpoint) {
   }
   var tmp = destination;
   // Inline function 'kotlin.collections.map' call
-  var this_1 = endpoint.xp_1;
+  var this_1 = endpoint.yp_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_1, 10));
   var _iterator__ex2g4s_0 = this_1.t();
@@ -1122,7 +1127,7 @@ function paramList(_this__u8e3s4, endpoint) {
   }
   var tmp_0 = destination_0;
   // Inline function 'kotlin.collections.map' call
-  var this_2 = endpoint.yp_1;
+  var this_2 = endpoint.zp_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination_1 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_2, 10));
   var _iterator__ex2g4s_1 = this_2.t();
@@ -1132,12 +1137,12 @@ function paramList(_this__u8e3s4, endpoint) {
     destination_1.x(tmp$ret$6);
   }
   var tmp_1 = destination_1;
-  var tmp0_safe_receiver = _this__u8e3s4.dq_1;
+  var tmp0_safe_receiver = _this__u8e3s4.eq_1;
   return flatten(listOf([tmp, tmp_0, tmp_1, listOfNotNull(tmp0_safe_receiver == null ? null : toParam_1(tmp0_safe_receiver))]));
 }
 function paramList_0(_this__u8e3s4) {
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.hq_1;
+  var this_0 = _this__u8e3s4.iq_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
@@ -1147,17 +1152,17 @@ function paramList_0(_this__u8e3s4) {
     destination.x(tmp$ret$0);
   }
   var tmp = destination;
-  var tmp0_safe_receiver = _this__u8e3s4.iq_1;
+  var tmp0_safe_receiver = _this__u8e3s4.jq_1;
   return flatten(listOf([tmp, listOfNotNull(tmp0_safe_receiver == null ? null : toParam_1(tmp0_safe_receiver))]));
 }
 function toParam(_this__u8e3s4) {
-  return new Param(ParamType_PATH_getInstance(), _this__u8e3s4.bq_1, _this__u8e3s4.cq_1);
+  return new Param(ParamType_PATH_getInstance(), _this__u8e3s4.cq_1, _this__u8e3s4.dq_1);
 }
 function toParam_0(_this__u8e3s4, type) {
-  return new Param(type, _this__u8e3s4.qp_1, _this__u8e3s4.rp_1);
+  return new Param(type, _this__u8e3s4.rp_1, _this__u8e3s4.sp_1);
 }
 function toParam_1(_this__u8e3s4) {
-  return new Param(ParamType_BODY_getInstance(), new FieldIdentifier('body'), _this__u8e3s4.fq_1);
+  return new Param(ParamType_BODY_getInstance(), new FieldIdentifier('body'), _this__u8e3s4.gq_1);
 }
 var FileExtension_Java_instance;
 var FileExtension_Kotlin_instance;
@@ -1198,10 +1203,10 @@ function FileExtension_initEntries() {
 var $ENTRIES;
 function FileExtension(name, ordinal, value) {
   Enum.call(this, name, ordinal);
-  this.dr_1 = value;
+  this.er_1 = value;
 }
 protoOf(FileExtension).l1 = function () {
-  return this.dr_1;
+  return this.er_1;
 };
 function FileExtension_Java_getInstance() {
   FileExtension_initEntries();
@@ -1249,7 +1254,7 @@ function FileExtension_AvroIdl_getInstance() {
 }
 function Companion_0() {
 }
-protoOf(Companion_0).er = function (_this__u8e3s4) {
+protoOf(Companion_0).fr = function (_this__u8e3s4) {
   // Inline function 'kotlin.text.replaceFirstChar' call
   var tmp;
   // Inline function 'kotlin.text.isNotEmpty' call
@@ -1265,7 +1270,7 @@ protoOf(Companion_0).er = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(Companion_0).fr = function (_this__u8e3s4) {
+protoOf(Companion_0).gr = function (_this__u8e3s4) {
   // Inline function 'kotlin.text.replaceFirstChar' call
   var tmp;
   // Inline function 'kotlin.text.isNotEmpty' call
@@ -1281,8 +1286,8 @@ protoOf(Companion_0).fr = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(Companion_0).gr = function (_this__u8e3s4) {
-  var tmp0 = new NonEmptyList(_this__u8e3s4.tq_1);
+protoOf(Companion_0).hr = function (_this__u8e3s4) {
+  var tmp0 = new NonEmptyList(_this__u8e3s4.uq_1);
   var tmp$ret$0;
   $l$block_0: {
     // Inline function 'kotlin.collections.any' call
@@ -1320,8 +1325,8 @@ protoOf(Companion_0).gr = function (_this__u8e3s4) {
   }
   return tmp$ret$0;
 };
-protoOf(Companion_0).hr = function (_this__u8e3s4) {
-  var tmp0 = new NonEmptyList(_this__u8e3s4.tq_1);
+protoOf(Companion_0).ir = function (_this__u8e3s4) {
+  var tmp0 = new NonEmptyList(_this__u8e3s4.uq_1);
   var tmp$ret$0;
   $l$block_0: {
     // Inline function 'kotlin.collections.any' call
@@ -1371,7 +1376,7 @@ protoOf(Companion_0).hr = function (_this__u8e3s4) {
   }
   return tmp$ret$0;
 };
-protoOf(Companion_0).ir = function (_this__u8e3s4) {
+protoOf(Companion_0).jr = function (_this__u8e3s4) {
   var tmp0_safe_receiver = toIntOrNull(_this__u8e3s4);
   var tmp;
   if (tmp0_safe_receiver == null) {
@@ -1391,7 +1396,7 @@ function LanguageEmitter() {
 }
 protoOf(LanguageEmitter).eo = function (ast, logger) {
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = ast.rq_1;
+  var this_0 = ast.sq_1;
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -1399,8 +1404,8 @@ protoOf(LanguageEmitter).eo = function (ast, logger) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    logger.jr('Emitting Nodes from ' + element.sq_1.tn_1 + ' ');
-    var list = new NonEmptyList(this.kr(element, logger));
+    logger.kr('Emitting Nodes from ' + element.tq_1.tn_1 + ' ');
+    var list = new NonEmptyList(this.lr(element, logger));
     addAll(destination, list);
   }
   // Inline function 'arrow.core.NonEmptyList.map' call
@@ -1412,14 +1417,14 @@ protoOf(LanguageEmitter).eo = function (ast, logger) {
   var _iterator__ex2g4s_0 = this_2.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$4 = new Emitted(item.yo_1 + '.' + this.uq().dr_1, item.zo_1);
+    var tmp$ret$4 = new Emitted(item.yo_1 + '.' + this.vq().er_1, item.zo_1);
     destination_0.x(tmp$ret$4);
   }
   return _NonEmptyList___init__impl__fxd0xp(destination_0);
 };
-protoOf(LanguageEmitter).kr = function (module_0, logger) {
+protoOf(LanguageEmitter).lr = function (module_0, logger) {
   // Inline function 'arrow.core.NonEmptyList.map' call
-  var this_0 = module_0.tq_1;
+  var this_0 = module_0.uq_1;
   // Inline function 'kotlin.collections.map' call
   var this_1 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.mapTo' call
@@ -1427,32 +1432,32 @@ protoOf(LanguageEmitter).kr = function (module_0, logger) {
   var _iterator__ex2g4s = this_1.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$0 = this.lr(item, module_0, logger);
+    var tmp$ret$0 = this.mr(item, module_0, logger);
     destination.x(tmp$ret$0);
   }
   return _NonEmptyList___init__impl__fxd0xp(destination);
 };
-protoOf(LanguageEmitter).lr = function (definition, module_0, logger) {
+protoOf(LanguageEmitter).mr = function (definition, module_0, logger) {
   // Inline function 'kotlin.run' call
-  logger.jr('Emitting ' + getKClassFromExpression(definition).o() + ' ' + definition.mr().l1());
+  logger.kr('Emitting ' + getKClassFromExpression(definition).o() + ' ' + definition.nr().l1());
   var tmp;
   if (definition instanceof Type) {
-    tmp = new Emitted(this.nr(definition.lp_1), this.kq(definition, module_0));
+    tmp = new Emitted(this.or(definition.mp_1), this.lq(definition, module_0));
   } else {
     if (definition instanceof Endpoint) {
-      tmp = new Emitted(this.nr(definition.up_1), this.as(definition));
+      tmp = new Emitted(this.or(definition.vp_1), this.bs(definition));
     } else {
       if (definition instanceof Enum_0) {
-        tmp = new Emitted(this.nr(definition.xr_1), this.zr(definition, module_0));
+        tmp = new Emitted(this.or(definition.yr_1), this.as(definition, module_0));
       } else {
         if (definition instanceof Refined) {
-          tmp = new Emitted(this.nr(definition.sr_1), this.ur(definition));
+          tmp = new Emitted(this.or(definition.tr_1), this.vr(definition));
         } else {
           if (definition instanceof Union) {
-            tmp = new Emitted(this.nr(definition.gp_1), this.pr(definition));
+            tmp = new Emitted(this.or(definition.hp_1), this.qr(definition));
           } else {
             if (definition instanceof Channel) {
-              tmp = new Emitted(this.nr(definition.cp_1), this.or(definition));
+              tmp = new Emitted(this.or(definition.dp_1), this.pr(definition));
             } else {
               noWhenBranchMatchedException();
             }
@@ -1465,7 +1470,7 @@ protoOf(LanguageEmitter).lr = function (definition, module_0, logger) {
 };
 function Companion_1() {
 }
-protoOf(Companion_1).cs = function (value) {
+protoOf(Companion_1).ds = function (value) {
   // Inline function 'kotlin.let' call
   return new PackageName(value == null ? 'community.flock.wirespec' : value, !(value == null));
 };
@@ -1474,31 +1479,31 @@ function Companion_getInstance_2() {
   return Companion_instance_2;
 }
 function PackageName(value, createDirectory) {
-  this.ds_1 = value;
-  this.es_1 = createDirectory;
+  this.es_1 = value;
+  this.fs_1 = createDirectory;
 }
 protoOf(PackageName).l1 = function () {
-  return this.ds_1;
+  return this.es_1;
 };
 protoOf(PackageName).toString = function () {
-  return this.ds_1;
+  return this.es_1;
 };
-protoOf(PackageName).fs = function () {
-  return replace(this.ds_1, '.', '/') + '/';
+protoOf(PackageName).gs = function () {
+  return replace(this.es_1, '.', '/') + '/';
 };
 function plus_0(_this__u8e3s4, definition) {
   return plus_1(_this__u8e3s4, namespace(definition));
 }
 function plus_1(_this__u8e3s4, subPackage) {
-  return Companion_instance_2.cs(_this__u8e3s4.ds_1 + '.' + subPackage);
+  return Companion_instance_2.ds(_this__u8e3s4.es_1 + '.' + subPackage);
 }
 function Spacer() {
-  this.gs_1 = '  ';
+  this.hs_1 = '  ';
 }
 protoOf(Spacer).toString = function () {
   return '  ';
 };
-protoOf(Spacer).hs = function (times) {
+protoOf(Spacer).is = function (times) {
   return repeat('  ', times);
 };
 protoOf(Spacer).hashCode = function () {
@@ -1543,7 +1548,7 @@ function Companion_getInstance_3() {
   return Companion_instance_3;
 }
 function WrongTokenException(fileUri, expected, actual) {
-  EatTokenException.call(this, fileUri, actual.ks_1, '' + expected.o() + ' expected, not: ' + name(actual.js_1) + ' at line ' + actual.ks_1.ls_1 + ' and position ' + (actual.ks_1.ms_1 - actual.is_1.length | 0));
+  EatTokenException.call(this, fileUri, actual.ls_1, '' + expected.o() + ' expected, not: ' + name(actual.ks_1) + ' at line ' + actual.ls_1.ms_1 + ' and position ' + (actual.ls_1.ns_1 - actual.js_1.length | 0));
 }
 function NextException(fileUri, coordinates) {
   NullTokenException.call(this, fileUri, 'Next Token', coordinates);
@@ -1579,16 +1584,16 @@ function ValidationError(coordinates, message) {
   WirespecException.call(this, new FileUri(''), message, coordinates);
 }
 function WirespecException(fileUri, message, coordinates) {
-  this.os_1 = fileUri;
-  this.ps_1 = message;
-  this.qs_1 = coordinates;
+  this.ps_1 = fileUri;
+  this.qs_1 = message;
+  this.rs_1 = coordinates;
 }
 protoOf(WirespecException).e = function () {
-  return this.ps_1;
+  return this.qs_1;
 };
 function AnnotationParser() {
 }
-protoOf(AnnotationParser).rs = function (_this__u8e3s4) {
+protoOf(AnnotationParser).ss = function (_this__u8e3s4) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'arrow.core.raise.fold' call
@@ -1596,9 +1601,9 @@ protoOf(AnnotationParser).rs = function (_this__u8e3s4) {
   var tmp;
   try {
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof Annotation_0) {
+    if (_this__u8e3s4.ws_1.ks_1 instanceof Annotation_0) {
       var annotation = raise.vm(parseAnnotation(_this__u8e3s4));
-      var remaining = raise.vm(AnnotationParser_instance.rs(_this__u8e3s4));
+      var remaining = raise.vm(AnnotationParser_instance.ss(_this__u8e3s4));
       tmp_0 = plus(listOf_0(annotation), remaining);
     } else {
       tmp_0 = emptyList();
@@ -1638,17 +1643,17 @@ function parseAnnotation(_this__u8e3s4) {
   var tmp;
   try {
     // Inline function 'kotlin.also' call
-    var this_0 = drop_0(_this__u8e3s4.vs_1.is_1, 1);
-    raise.vm(_this__u8e3s4.ys());
+    var this_0 = drop_0(_this__u8e3s4.ws_1.js_1, 1);
+    raise.vm(_this__u8e3s4.zs());
     var name = this_0;
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof LeftParenthesis) {
-      raise.vm(_this__u8e3s4.ys());
+    if (_this__u8e3s4.ws_1.ks_1 instanceof LeftParenthesis) {
+      raise.vm(_this__u8e3s4.zs());
       // Inline function 'kotlin.also' call
       var this_1 = raise.vm(parseAnnotationParameters(_this__u8e3s4));
-      var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+      var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
       if (equals(tmp0_subject, RightParenthesis_instance))
-        raise.vm(_this__u8e3s4.ys());
+        raise.vm(_this__u8e3s4.zs());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         // Inline function 'arrow.core.raise.either' call
@@ -1657,12 +1662,12 @@ function parseAnnotation(_this__u8e3s4) {
         var raise_0 = new DefaultRaise(false);
         var tmp_1;
         try {
-          var tmp2 = _this__u8e3s4.ss_1;
+          var tmp2 = _this__u8e3s4.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? _this__u8e3s4.vs_1 : null;
+          var actual = null == null ? _this__u8e3s4.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_2 = new WrongTokenException(tmp2, getKClass(RightParenthesis), actual);
-          raise_0.vm(_this__u8e3s4.ys());
+          raise_0.vm(_this__u8e3s4.zs());
           raise_0.rm(this_2);
         } catch ($p) {
           var tmp_2;
@@ -1721,13 +1726,13 @@ function parseAnnotationParameters(_this__u8e3s4) {
   var tmp;
   try {
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof RightParenthesis) {
+    if (_this__u8e3s4.ws_1.ks_1 instanceof RightParenthesis) {
       tmp_0 = emptyList();
     } else {
       var params = raise.vm(parseAnnotationParameter(_this__u8e3s4));
       var tmp_1;
-      if (_this__u8e3s4.vs_1.js_1 instanceof Comma) {
-        raise.vm(_this__u8e3s4.ys());
+      if (_this__u8e3s4.ws_1.ks_1 instanceof Comma) {
+        raise.vm(_this__u8e3s4.zs());
         tmp_1 = raise.vm(parseAnnotationParameters(_this__u8e3s4));
       } else {
         tmp_1 = emptyList();
@@ -1765,7 +1770,7 @@ function parseAnnotationParameter(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_0;
     if (tmp0_subject instanceof LeftBracket) {
       var arr = raise.vm(parseArray(_this__u8e3s4));
@@ -1775,12 +1780,12 @@ function parseAnnotationParameter(_this__u8e3s4) {
         var dictParams = raise.vm(parseDict(_this__u8e3s4));
         tmp_0 = listOf_0(new Parameter('default', new Dict(dictParams)));
       } else {
-        var tmp1_subject = _this__u8e3s4.vs_1.js_1;
-        var firstTokenValue = equals(tmp1_subject, LiteralString_instance) ? removeSurrounding(_this__u8e3s4.vs_1.is_1, '"') : _this__u8e3s4.vs_1.is_1;
-        raise.vm(_this__u8e3s4.ys());
+        var tmp1_subject = _this__u8e3s4.ws_1.ks_1;
+        var firstTokenValue = equals(tmp1_subject, LiteralString_instance) ? removeSurrounding(_this__u8e3s4.ws_1.js_1, '"') : _this__u8e3s4.ws_1.js_1;
+        raise.vm(_this__u8e3s4.zs());
         var tmp_1;
-        if (_this__u8e3s4.vs_1.js_1 instanceof Colon) {
-          raise.vm(_this__u8e3s4.ys());
+        if (_this__u8e3s4.ws_1.ks_1 instanceof Colon) {
+          raise.vm(_this__u8e3s4.zs());
           var valueNode = raise.vm(parseAnnotationValue(_this__u8e3s4));
           tmp_1 = listOf_0(new Parameter(firstTokenValue, valueNode));
         } else {
@@ -1819,8 +1824,8 @@ function parseArray(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    if (_this__u8e3s4.vs_1.js_1 instanceof LeftBracket)
-      raise.vm(_this__u8e3s4.ys());
+    if (_this__u8e3s4.ws_1.ks_1 instanceof LeftBracket)
+      raise.vm(_this__u8e3s4.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
@@ -1829,12 +1834,12 @@ function parseArray(_this__u8e3s4) {
       var raise_0 = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = _this__u8e3s4.ss_1;
+        var tmp2 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_0 = new WrongTokenException(tmp2, getKClass(LeftBracket), actual);
-        raise_0.vm(_this__u8e3s4.ys());
+        raise_0.vm(_this__u8e3s4.zs());
         raise_0.rm(this_0);
       } catch ($p) {
         var tmp_1;
@@ -1860,19 +1865,19 @@ function parseArray(_this__u8e3s4) {
     }
     // Inline function 'kotlin.collections.mutableListOf' call
     var items = ArrayList_init_$Create$_0();
-    while (!equals(_this__u8e3s4.vs_1.js_1, RightBracket_instance)) {
-      var tmp1_subject = _this__u8e3s4.vs_1.js_1;
-      var v = equals(tmp1_subject, LiteralString_instance) ? new Single(removeSurrounding(_this__u8e3s4.vs_1.is_1, '"')) : new Single(_this__u8e3s4.vs_1.is_1);
+    while (!equals(_this__u8e3s4.ws_1.ks_1, RightBracket_instance)) {
+      var tmp1_subject = _this__u8e3s4.ws_1.ks_1;
+      var v = equals(tmp1_subject, LiteralString_instance) ? new Single(removeSurrounding(_this__u8e3s4.ws_1.js_1, '"')) : new Single(_this__u8e3s4.ws_1.js_1);
       items.x(v);
-      raise.vm(_this__u8e3s4.ys());
-      var tmp_2 = _this__u8e3s4.vs_1.js_1;
+      raise.vm(_this__u8e3s4.zs());
+      var tmp_2 = _this__u8e3s4.ws_1.ks_1;
       if (tmp_2 instanceof Comma) {
-        raise.vm(_this__u8e3s4.ys());
+        raise.vm(_this__u8e3s4.zs());
       }
     }
-    var tmp2_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp2_subject = _this__u8e3s4.ws_1.ks_1;
     if (equals(tmp2_subject, RightBracket_instance))
-      raise.vm(_this__u8e3s4.ys());
+      raise.vm(_this__u8e3s4.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
@@ -1881,12 +1886,12 @@ function parseArray(_this__u8e3s4) {
       var raise_1 = new DefaultRaise(false);
       var tmp_3;
       try {
-        var tmp2_0 = _this__u8e3s4.ss_1;
+        var tmp2_0 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual_0 = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2_0, getKClass(RightBracket), actual_0);
-        raise_1.vm(_this__u8e3s4.ys());
+        raise_1.vm(_this__u8e3s4.zs());
         raise_1.rm(this_1);
       } catch ($p) {
         var tmp_4;
@@ -1940,8 +1945,8 @@ function parseDict(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    if (_this__u8e3s4.vs_1.js_1 instanceof LeftCurly)
-      raise.vm(_this__u8e3s4.ys());
+    if (_this__u8e3s4.ws_1.ks_1 instanceof LeftCurly)
+      raise.vm(_this__u8e3s4.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
@@ -1950,12 +1955,12 @@ function parseDict(_this__u8e3s4) {
       var raise_0 = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = _this__u8e3s4.ss_1;
+        var tmp2 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_0 = new WrongTokenException(tmp2, getKClass(LeftCurly), actual);
-        raise_0.vm(_this__u8e3s4.ys());
+        raise_0.vm(_this__u8e3s4.zs());
         raise_0.rm(this_0);
       } catch ($p) {
         var tmp_1;
@@ -1982,14 +1987,14 @@ function parseDict(_this__u8e3s4) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var params = ArrayList_init_$Create$_0();
     $l$loop: while (true) {
-      var tmp_2 = _this__u8e3s4.vs_1.js_1;
+      var tmp_2 = _this__u8e3s4.ws_1.ks_1;
       if (!!(tmp_2 instanceof RightCurly)) {
         break $l$loop;
       }
-      var key = _this__u8e3s4.vs_1.is_1;
-      raise.vm(_this__u8e3s4.ys());
-      if (_this__u8e3s4.vs_1.js_1 instanceof Colon)
-        raise.vm(_this__u8e3s4.ys());
+      var key = _this__u8e3s4.ws_1.js_1;
+      raise.vm(_this__u8e3s4.zs());
+      if (_this__u8e3s4.ws_1.ks_1 instanceof Colon)
+        raise.vm(_this__u8e3s4.zs());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         // Inline function 'arrow.core.raise.either' call
@@ -1998,12 +2003,12 @@ function parseDict(_this__u8e3s4) {
         var raise_1 = new DefaultRaise(false);
         var tmp_3;
         try {
-          var tmp2_0 = _this__u8e3s4.ss_1;
+          var tmp2_0 = _this__u8e3s4.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? _this__u8e3s4.vs_1 : null;
+          var actual_0 = null == null ? _this__u8e3s4.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2_0, getKClass(Colon), actual_0);
-          raise_1.vm(_this__u8e3s4.ys());
+          raise_1.vm(_this__u8e3s4.zs());
           raise_1.rm(this_1);
         } catch ($p) {
           var tmp_4;
@@ -2029,13 +2034,13 @@ function parseDict(_this__u8e3s4) {
       }
       var value = raise.vm(parseAnnotationValue(_this__u8e3s4));
       params.x(new Parameter(key, value));
-      var tmp_5 = _this__u8e3s4.vs_1.js_1;
+      var tmp_5 = _this__u8e3s4.ws_1.ks_1;
       if (tmp_5 instanceof Comma) {
-        raise.vm(_this__u8e3s4.ys());
+        raise.vm(_this__u8e3s4.zs());
       }
     }
-    if (_this__u8e3s4.vs_1.js_1 instanceof RightCurly)
-      raise.vm(_this__u8e3s4.ys());
+    if (_this__u8e3s4.ws_1.ks_1 instanceof RightCurly)
+      raise.vm(_this__u8e3s4.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
@@ -2044,12 +2049,12 @@ function parseDict(_this__u8e3s4) {
       var raise_2 = new DefaultRaise(false);
       var tmp_6;
       try {
-        var tmp2_1 = _this__u8e3s4.ss_1;
+        var tmp2_1 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual_1 = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2_1, getKClass(RightCurly), actual_1);
-        raise_2.vm(_this__u8e3s4.ys());
+        raise_2.vm(_this__u8e3s4.zs());
         raise_2.rm(this_2);
       } catch ($p) {
         var tmp_7;
@@ -2103,7 +2108,7 @@ function parseAnnotationValue(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_0;
     if (tmp0_subject instanceof LeftBracket) {
       var arr = raise.vm(parseArray(_this__u8e3s4));
@@ -2114,16 +2119,16 @@ function parseAnnotationValue(_this__u8e3s4) {
         tmp_0 = new Dict(dictParams);
       } else {
         if (equals(tmp0_subject, LiteralString_instance)) {
-          tmp_0 = new Single(removeSurrounding(_this__u8e3s4.vs_1.is_1, '"'));
+          tmp_0 = new Single(removeSurrounding(_this__u8e3s4.ws_1.js_1, '"'));
         } else {
-          tmp_0 = new Single(_this__u8e3s4.vs_1.is_1);
+          tmp_0 = new Single(_this__u8e3s4.ws_1.js_1);
         }
       }
     }
     // Inline function 'kotlin.also' call
     var this_0 = tmp_0;
     if (this_0 instanceof Single) {
-      raise.vm(_this__u8e3s4.ys());
+      raise.vm(_this__u8e3s4.zs());
     }
     var res = this_0;
     raise.nm();
@@ -2153,10 +2158,10 @@ function parseChannelDefinition($this, _this__u8e3s4, comment, annotations, iden
 }
 function ChannelParser$parseChannel$lambda($this_parseChannel, $comment, $annotations) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseChannel.vs_1.js_1;
+    var tmp0_subject = $this_parseChannel.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp = $this$parseToken.vm(parseChannelDefinition(ChannelParser_instance, $this_parseChannel, $comment, $annotations, new DefinitionIdentifier($this_parseChannel.vs_1.is_1)));
+      tmp = $this$parseToken.vm(parseChannelDefinition(ChannelParser_instance, $this_parseChannel, $comment, $annotations, new DefinitionIdentifier($this_parseChannel.ws_1.js_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseChannel;
@@ -2166,12 +2171,12 @@ function ChannelParser$parseChannel$lambda($this_parseChannel, $comment, $annota
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(WirespecType_0), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -2200,8 +2205,8 @@ function ChannelParser$parseChannel$lambda($this_parseChannel, $comment, $annota
 }
 function ChannelParser$parseChannelDefinition$lambda($this_parseChannelDefinition, $comment, $annotations, $identifier) {
   return function ($this$parseToken, it) {
-    if ($this_parseChannelDefinition.vs_1.js_1 instanceof Arrow)
-      $this$parseToken.vm($this_parseChannelDefinition.ys());
+    if ($this_parseChannelDefinition.ws_1.ks_1 instanceof Arrow)
+      $this$parseToken.vm($this_parseChannelDefinition.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseChannelDefinition;
@@ -2211,12 +2216,12 @@ function ChannelParser$parseChannelDefinition$lambda($this_parseChannelDefinitio
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(Colon), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_0;
@@ -2241,13 +2246,13 @@ function ChannelParser$parseChannelDefinition$lambda($this_parseChannelDefinitio
       throwKotlinNothingValueException();
     }
     // Inline function 'kotlin.with' call
-    var tmp0_subject = $this_parseChannelDefinition.vs_1.js_1;
+    var tmp0_subject = $this_parseChannelDefinition.ws_1.ks_1;
     var tmp_1;
     if (tmp0_subject instanceof LeftCurly) {
-      tmp_1 = $this$parseToken.vm(TypeParser_instance.at($this_parseChannelDefinition));
+      tmp_1 = $this$parseToken.vm(TypeParser_instance.bt($this_parseChannelDefinition));
     } else {
       if (isInterface(tmp0_subject, WirespecType_0)) {
-        tmp_1 = $this$parseToken.vm(TypeParser_instance.zs($this_parseChannelDefinition));
+        tmp_1 = $this$parseToken.vm(TypeParser_instance.at($this_parseChannelDefinition));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_2 = $this_parseChannelDefinition;
@@ -2257,12 +2262,12 @@ function ChannelParser$parseChannelDefinition$lambda($this_parseChannelDefinitio
         var raise_0 = new DefaultRaise(false);
         var tmp_2;
         try {
-          var tmp2_0 = this_2.ss_1;
+          var tmp2_0 = this_2.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? this_2.vs_1 : null;
+          var actual_0 = null == null ? this_2.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_3 = new WrongTokenException(tmp2_0, getKClass(WirespecType_0), actual_0);
-          raise_0.vm(this_2.ys());
+          raise_0.vm(this_2.zs());
           raise_0.rm(this_3);
         } catch ($p) {
           var tmp_3;
@@ -2293,7 +2298,7 @@ function ChannelParser$parseChannelDefinition$lambda($this_parseChannelDefinitio
 }
 function ChannelParser() {
 }
-protoOf(ChannelParser).bt = function (_this__u8e3s4, comment, annotations) {
+protoOf(ChannelParser).ct = function (_this__u8e3s4, comment, annotations) {
   return parseToken(_this__u8e3s4, ChannelParser$parseChannel$lambda(_this__u8e3s4, comment, annotations));
 };
 var ChannelParser_instance;
@@ -2310,12 +2315,12 @@ function parseEndpointSegments($this, _this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_0;
     if (tmp0_subject instanceof Path) {
       // Inline function 'kotlin.also' call
-      var this_0 = new Literal(drop_0(_this__u8e3s4.vs_1.is_1, 1));
-      raise.vm(_this__u8e3s4.ys());
+      var this_0 = new Literal(drop_0(_this__u8e3s4.ws_1.js_1, 1));
+      raise.vm(_this__u8e3s4.zs());
       tmp_0 = this_0;
     } else {
       if (tmp0_subject instanceof ForwardSlash) {
@@ -2328,12 +2333,12 @@ function parseEndpointSegments($this, _this__u8e3s4) {
         var raise_0 = new DefaultRaise(false);
         var tmp_1;
         try {
-          var tmp2 = _this__u8e3s4.ss_1;
+          var tmp2 = _this__u8e3s4.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? _this__u8e3s4.vs_1 : null;
+          var actual = null == null ? _this__u8e3s4.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(Path), actual);
-          raise_0.vm(_this__u8e3s4.ys());
+          raise_0.vm(_this__u8e3s4.zs());
           raise_0.rm(this_1);
         } catch ($p) {
           var tmp_2;
@@ -2394,13 +2399,13 @@ function parseEndpointResponses($this, _this__u8e3s4) {
     // Inline function 'kotlin.collections.mutableListOf' call
     var responses = ArrayList_init_$Create$_0();
     $l$loop: while (true) {
-      var tmp_0 = _this__u8e3s4.vs_1.js_1;
+      var tmp_0 = _this__u8e3s4.ws_1.ks_1;
       if (!!(tmp_0 instanceof RightCurly)) {
         break $l$loop;
       }
-      var annotations = raise.vm(AnnotationParser_instance.rs(_this__u8e3s4));
-      if (_this__u8e3s4.vs_1.js_1 instanceof Integer_0)
-        responses.x(raise.vm(parseEndpointResponse(EndpointParser_instance, _this__u8e3s4, _this__u8e3s4.vs_1.is_1, annotations)));
+      var annotations = raise.vm(AnnotationParser_instance.ss(_this__u8e3s4));
+      if (_this__u8e3s4.ws_1.ks_1 instanceof Integer_0)
+        responses.x(raise.vm(parseEndpointResponse(EndpointParser_instance, _this__u8e3s4, _this__u8e3s4.ws_1.js_1, annotations)));
       else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         // Inline function 'arrow.core.raise.either' call
@@ -2409,12 +2414,12 @@ function parseEndpointResponses($this, _this__u8e3s4) {
         var raise_0 = new DefaultRaise(false);
         var tmp_1;
         try {
-          var tmp2 = _this__u8e3s4.ss_1;
+          var tmp2 = _this__u8e3s4.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? _this__u8e3s4.vs_1 : null;
+          var actual = null == null ? _this__u8e3s4.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_0 = new WrongTokenException(tmp2, getKClass(Integer_0), actual);
-          raise_0.vm(_this__u8e3s4.ys());
+          raise_0.vm(_this__u8e3s4.zs());
           raise_0.rm(this_0);
         } catch ($p) {
           var tmp_2;
@@ -2439,7 +2444,7 @@ function parseEndpointResponses($this, _this__u8e3s4) {
         throwKotlinNothingValueException();
       }
     }
-    if (!(_this__u8e3s4.vs_1.js_1 instanceof RightCurly)) {
+    if (!(_this__u8e3s4.ws_1.ks_1 instanceof RightCurly)) {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
       // Inline function 'arrow.core.raise.fold' call
@@ -2447,12 +2452,12 @@ function parseEndpointResponses($this, _this__u8e3s4) {
       var raise_1 = new DefaultRaise(false);
       var tmp_3;
       try {
-        var tmp2_0 = _this__u8e3s4.ss_1;
+        var tmp2_0 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual_0 = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2_0, getKClass(RightCurly), actual_0);
-        raise_1.vm(_this__u8e3s4.ys());
+        raise_1.vm(_this__u8e3s4.zs());
         raise_1.rm(this_1);
       } catch ($p) {
         var tmp_4;
@@ -2477,7 +2482,7 @@ function parseEndpointResponses($this, _this__u8e3s4) {
       throwKotlinNothingValueException();
     }
     // Inline function 'kotlin.also' call
-    raise.vm(_this__u8e3s4.ys());
+    raise.vm(_this__u8e3s4.zs());
     var res = toList(responses);
     raise.nm();
     tmp = new Right(res);
@@ -2512,12 +2517,12 @@ function parseHeaders($this, _this__u8e3s4) {
   var tmp;
   try {
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof Hash) {
-      raise.vm(_this__u8e3s4.ys());
+    if (_this__u8e3s4.ws_1.ks_1 instanceof Hash) {
+      raise.vm(_this__u8e3s4.zs());
       var tmp_1;
-      if (_this__u8e3s4.vs_1.js_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.ws_1.ks_1 instanceof LeftCurly) {
         // Inline function 'kotlin.with' call
-        tmp_1 = raise.vm(TypeParser_instance.ct(_this__u8e3s4)).ip_1;
+        tmp_1 = raise.vm(TypeParser_instance.dt(_this__u8e3s4)).jp_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         // Inline function 'arrow.core.raise.either' call
@@ -2526,12 +2531,12 @@ function parseHeaders($this, _this__u8e3s4) {
         var raise_0 = new DefaultRaise(false);
         var tmp_2;
         try {
-          var tmp2 = _this__u8e3s4.ss_1;
+          var tmp2 = _this__u8e3s4.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? _this__u8e3s4.vs_1 : null;
+          var actual = null == null ? _this__u8e3s4.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_0 = new WrongTokenException(tmp2, getKClass(LeftCurly), actual);
-          raise_0.vm(_this__u8e3s4.ys());
+          raise_0.vm(_this__u8e3s4.zs());
           raise_0.rm(this_0);
         } catch ($p) {
           var tmp_3;
@@ -2584,10 +2589,10 @@ function parseHeaders($this, _this__u8e3s4) {
 }
 function EndpointParser$parseEndpoint$lambda($this_parseEndpoint, $comment, $annotations) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseEndpoint.vs_1.js_1;
+    var tmp0_subject = $this_parseEndpoint.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp = $this$parseToken.vm(parseEndpointDefinition(EndpointParser_instance, $this_parseEndpoint, $comment, $annotations, new DefinitionIdentifier($this_parseEndpoint.vs_1.is_1)));
+      tmp = $this$parseToken.vm(parseEndpointDefinition(EndpointParser_instance, $this_parseEndpoint, $comment, $annotations, new DefinitionIdentifier($this_parseEndpoint.ws_1.js_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseEndpoint;
@@ -2597,12 +2602,12 @@ function EndpointParser$parseEndpoint$lambda($this_parseEndpoint, $comment, $ann
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(WirespecType_0), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -2632,8 +2637,8 @@ function EndpointParser$parseEndpoint$lambda($this_parseEndpoint, $comment, $ann
 function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefinition, $comment, $annotations, $name) {
   return function ($this$parseToken, it) {
     var tmp;
-    if ($this_parseEndpointDefinition.vs_1.js_1 instanceof Method_0) {
-      tmp = valueOf($this_parseEndpointDefinition.vs_1.is_1);
+    if ($this_parseEndpointDefinition.ws_1.ks_1 instanceof Method_0) {
+      tmp = valueOf($this_parseEndpointDefinition.ws_1.js_1);
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseEndpointDefinition;
@@ -2643,12 +2648,12 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(Method_0), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -2674,16 +2679,16 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
     }
     // Inline function 'kotlin.also' call
     var this_2 = tmp;
-    $this$parseToken.vm($this_parseEndpointDefinition.ys());
+    $this$parseToken.vm($this_parseEndpointDefinition.zs());
     var method = this_2;
     // Inline function 'kotlin.with' call
-    var tmp0_subject = $this_parseEndpointDefinition.vs_1.js_1;
+    var tmp0_subject = $this_parseEndpointDefinition.ws_1.ks_1;
     var tmp_2;
     if (tmp0_subject instanceof LeftCurly) {
-      tmp_2 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointDefinition));
+      tmp_2 = $this$parseToken.vm(TypeParser_instance.bt($this_parseEndpointDefinition));
     } else {
       if (isInterface(tmp0_subject, WirespecType_0)) {
-        tmp_2 = $this$parseToken.vm(TypeParser_instance.zs($this_parseEndpointDefinition));
+        tmp_2 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointDefinition));
       } else {
         tmp_2 = null;
       }
@@ -2713,15 +2718,15 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
     $l$loop: while (true) {
       var tmp_4;
       var tmp_5;
-      var tmp_6 = $this_parseEndpointDefinition.vs_1.js_1;
+      var tmp_6 = $this_parseEndpointDefinition.ws_1.ks_1;
       if (!(tmp_6 instanceof QuestionMark)) {
-        var tmp_7 = $this_parseEndpointDefinition.vs_1.js_1;
+        var tmp_7 = $this_parseEndpointDefinition.ws_1.ks_1;
         tmp_5 = !(tmp_7 instanceof Hash);
       } else {
         tmp_5 = false;
       }
       if (tmp_5) {
-        var tmp_8 = $this_parseEndpointDefinition.vs_1.js_1;
+        var tmp_8 = $this_parseEndpointDefinition.ws_1.ks_1;
         tmp_4 = !(tmp_8 instanceof Arrow);
       } else {
         tmp_4 = false;
@@ -2733,12 +2738,12 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
     }
     var segments = this_4;
     var tmp_9;
-    if ($this_parseEndpointDefinition.vs_1.js_1 instanceof QuestionMark) {
-      $this$parseToken.vm($this_parseEndpointDefinition.ys());
+    if ($this_parseEndpointDefinition.ws_1.ks_1 instanceof QuestionMark) {
+      $this$parseToken.vm($this_parseEndpointDefinition.zs());
       var tmp_10;
-      if ($this_parseEndpointDefinition.vs_1.js_1 instanceof LeftCurly) {
+      if ($this_parseEndpointDefinition.ws_1.ks_1 instanceof LeftCurly) {
         // Inline function 'kotlin.with' call
-        tmp_10 = $this$parseToken.vm(TypeParser_instance.ct($this_parseEndpointDefinition)).ip_1;
+        tmp_10 = $this$parseToken.vm(TypeParser_instance.dt($this_parseEndpointDefinition)).jp_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_5 = $this_parseEndpointDefinition;
@@ -2748,12 +2753,12 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
         var raise_0 = new DefaultRaise(false);
         var tmp_11;
         try {
-          var tmp2_0 = this_5.ss_1;
+          var tmp2_0 = this_5.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? this_5.vs_1 : null;
+          var actual_0 = null == null ? this_5.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_6 = new WrongTokenException(tmp2_0, getKClass(LeftCurly), actual_0);
-          raise_0.vm(this_5.ys());
+          raise_0.vm(this_5.zs());
           raise_0.rm(this_6);
         } catch ($p) {
           var tmp_12;
@@ -2783,8 +2788,8 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
     }
     var queryParams = tmp_9;
     var headers = $this$parseToken.vm(parseHeaders(EndpointParser_instance, $this_parseEndpointDefinition));
-    if ($this_parseEndpointDefinition.vs_1.js_1 instanceof Arrow)
-      $this$parseToken.vm($this_parseEndpointDefinition.ys());
+    if ($this_parseEndpointDefinition.ws_1.ks_1 instanceof Arrow)
+      $this$parseToken.vm($this_parseEndpointDefinition.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_7 = $this_parseEndpointDefinition;
@@ -2794,12 +2799,12 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
       var raise_1 = new DefaultRaise(false);
       var tmp_13;
       try {
-        var tmp2_1 = this_7.ss_1;
+        var tmp2_1 = this_7.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = null == null ? this_7.vs_1 : null;
+        var actual_1 = null == null ? this_7.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_8 = new WrongTokenException(tmp2_1, getKClass(Arrow), actual_1);
-        raise_1.vm(this_7.ys());
+        raise_1.vm(this_7.zs());
         raise_1.rm(this_8);
       } catch ($p) {
         var tmp_14;
@@ -2823,7 +2828,7 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
       $this$parseToken.vm(tmp$ret$40);
       throwKotlinNothingValueException();
     }
-    if (!($this_parseEndpointDefinition.vs_1.js_1 instanceof LeftCurly)) {
+    if (!($this_parseEndpointDefinition.ws_1.ks_1 instanceof LeftCurly)) {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_9 = $this_parseEndpointDefinition;
       // Inline function 'arrow.core.raise.either' call
@@ -2832,12 +2837,12 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
       var raise_2 = new DefaultRaise(false);
       var tmp_15;
       try {
-        var tmp2_2 = this_9.ss_1;
+        var tmp2_2 = this_9.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_2 = null == null ? this_9.vs_1 : null;
+        var actual_2 = null == null ? this_9.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_10 = new WrongTokenException(tmp2_2, getKClass(LeftCurly), actual_2);
-        raise_2.vm(this_9.ys());
+        raise_2.vm(this_9.zs());
         raise_2.rm(this_10);
       } catch ($p) {
         var tmp_16;
@@ -2862,15 +2867,15 @@ function EndpointParser$parseEndpointDefinition$lambda($this_parseEndpointDefini
       throwKotlinNothingValueException();
     }
     // Inline function 'kotlin.also' call
-    $this$parseToken.vm($this_parseEndpointDefinition.ys());
+    $this$parseToken.vm($this_parseEndpointDefinition.zs());
     var responses = $this$parseToken.vm(parseEndpointResponses(EndpointParser_instance, $this_parseEndpointDefinition));
     return new Endpoint($comment, $annotations, $name, method, segments, queryParams, headers, requests, responses);
   };
 }
 function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegmentParam) {
   return function ($this$parseToken, it) {
-    if ($this_parseEndpointSegmentParam.vs_1.js_1 instanceof LeftCurly)
-      $this$parseToken.vm($this_parseEndpointSegmentParam.ys());
+    if ($this_parseEndpointSegmentParam.ws_1.ks_1 instanceof LeftCurly)
+      $this$parseToken.vm($this_parseEndpointSegmentParam.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseEndpointSegmentParam;
@@ -2880,12 +2885,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(LeftCurly), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_0;
@@ -2909,12 +2914,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       $this$parseToken.vm(tmp$ret$8);
       throwKotlinNothingValueException();
     }
-    var tmp1_subject = $this_parseEndpointSegmentParam.vs_1.js_1;
+    var tmp1_subject = $this_parseEndpointSegmentParam.ws_1.ks_1;
     var tmp_1;
     if (isInterface(tmp1_subject, WirespecIdentifier)) {
       // Inline function 'kotlin.also' call
-      var this_2 = new FieldIdentifier($this_parseEndpointSegmentParam.vs_1.is_1);
-      $this$parseToken.vm($this_parseEndpointSegmentParam.ys());
+      var this_2 = new FieldIdentifier($this_parseEndpointSegmentParam.ws_1.js_1);
+      $this$parseToken.vm($this_parseEndpointSegmentParam.zs());
       tmp_1 = this_2;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
@@ -2925,12 +2930,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       var raise_0 = new DefaultRaise(false);
       var tmp_2;
       try {
-        var tmp2_0 = this_3.ss_1;
+        var tmp2_0 = this_3.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_3.vs_1 : null;
+        var actual_0 = null == null ? this_3.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_4 = new WrongTokenException(tmp2_0, getKClass(WirespecIdentifier), actual_0);
-        raise_0.vm(this_3.ys());
+        raise_0.vm(this_3.zs());
         raise_0.rm(this_4);
       } catch ($p) {
         var tmp_3;
@@ -2955,8 +2960,8 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       tmp_1 = throwKotlinNothingValueException();
     }
     var identifier = tmp_1;
-    if ($this_parseEndpointSegmentParam.vs_1.js_1 instanceof Colon)
-      $this$parseToken.vm($this_parseEndpointSegmentParam.ys());
+    if ($this_parseEndpointSegmentParam.ws_1.ks_1 instanceof Colon)
+      $this$parseToken.vm($this_parseEndpointSegmentParam.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_5 = $this_parseEndpointSegmentParam;
@@ -2966,12 +2971,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       var raise_1 = new DefaultRaise(false);
       var tmp_4;
       try {
-        var tmp2_1 = this_5.ss_1;
+        var tmp2_1 = this_5.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = null == null ? this_5.vs_1 : null;
+        var actual_1 = null == null ? this_5.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_6 = new WrongTokenException(tmp2_1, getKClass(Colon), actual_1);
-        raise_1.vm(this_5.ys());
+        raise_1.vm(this_5.zs());
         raise_1.rm(this_6);
       } catch ($p) {
         var tmp_5;
@@ -2996,13 +3001,13 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       throwKotlinNothingValueException();
     }
     // Inline function 'kotlin.with' call
-    var tmp0_subject = $this_parseEndpointSegmentParam.vs_1.js_1;
+    var tmp0_subject = $this_parseEndpointSegmentParam.ws_1.ks_1;
     var tmp_6;
     if (tmp0_subject instanceof LeftCurly) {
-      tmp_6 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointSegmentParam));
+      tmp_6 = $this$parseToken.vm(TypeParser_instance.bt($this_parseEndpointSegmentParam));
     } else {
       if (isInterface(tmp0_subject, WirespecType_0)) {
-        tmp_6 = $this$parseToken.vm(TypeParser_instance.zs($this_parseEndpointSegmentParam));
+        tmp_6 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointSegmentParam));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_7 = $this_parseEndpointSegmentParam;
@@ -3012,12 +3017,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
         var raise_2 = new DefaultRaise(false);
         var tmp_7;
         try {
-          var tmp2_2 = this_7.ss_1;
+          var tmp2_2 = this_7.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_2 = null == null ? this_7.vs_1 : null;
+          var actual_2 = null == null ? this_7.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_8 = new WrongTokenException(tmp2_2, getKClass(WirespecType_0), actual_2);
-          raise_2.vm(this_7.ys());
+          raise_2.vm(this_7.zs());
           raise_2.rm(this_8);
         } catch ($p) {
           var tmp_8;
@@ -3043,8 +3048,8 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       }
     }
     var reference = tmp_6;
-    if ($this_parseEndpointSegmentParam.vs_1.js_1 instanceof RightCurly)
-      $this$parseToken.vm($this_parseEndpointSegmentParam.ys());
+    if ($this_parseEndpointSegmentParam.ws_1.ks_1 instanceof RightCurly)
+      $this$parseToken.vm($this_parseEndpointSegmentParam.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_9 = $this_parseEndpointSegmentParam;
@@ -3054,12 +3059,12 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
       var raise_3 = new DefaultRaise(false);
       var tmp_9;
       try {
-        var tmp2_3 = this_9.ss_1;
+        var tmp2_3 = this_9.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_3 = null == null ? this_9.vs_1 : null;
+        var actual_3 = null == null ? this_9.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_10 = new WrongTokenException(tmp2_3, getKClass(RightCurly), actual_3);
-        raise_3.vm(this_9.ys());
+        raise_3.vm(this_9.zs());
         raise_3.rm(this_10);
       } catch ($p) {
         var tmp_10;
@@ -3089,7 +3094,7 @@ function EndpointParser$parseEndpointSegmentParam$lambda($this_parseEndpointSegm
 function EndpointParser$parseEndpointResponse$lambda($this_parseEndpointResponse, $statusCode, $annotations) {
   return function ($this$parseToken, it) {
     var tmp;
-    if ($this_parseEndpointResponse.vs_1.js_1 instanceof Arrow) {
+    if ($this_parseEndpointResponse.ws_1.ks_1 instanceof Arrow) {
       tmp = Unit_instance;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
@@ -3100,12 +3105,12 @@ function EndpointParser$parseEndpointResponse$lambda($this_parseEndpointResponse
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(Arrow), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -3129,15 +3134,15 @@ function EndpointParser$parseEndpointResponse$lambda($this_parseEndpointResponse
       $this$parseToken.vm(tmp$ret$8);
       tmp = throwKotlinNothingValueException();
     }
-    $this$parseToken.vm($this_parseEndpointResponse.ys());
+    $this$parseToken.vm($this_parseEndpointResponse.zs());
     // Inline function 'kotlin.with' call
-    var tmp0_subject = $this_parseEndpointResponse.vs_1.js_1;
+    var tmp0_subject = $this_parseEndpointResponse.ws_1.ks_1;
     var tmp_2;
     if (tmp0_subject instanceof LeftCurly) {
-      tmp_2 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointResponse));
+      tmp_2 = $this$parseToken.vm(TypeParser_instance.bt($this_parseEndpointResponse));
     } else {
       if (isInterface(tmp0_subject, WirespecType_0)) {
-        tmp_2 = $this$parseToken.vm(TypeParser_instance.zs($this_parseEndpointResponse));
+        tmp_2 = $this$parseToken.vm(TypeParser_instance.at($this_parseEndpointResponse));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_2 = $this_parseEndpointResponse;
@@ -3147,12 +3152,12 @@ function EndpointParser$parseEndpointResponse$lambda($this_parseEndpointResponse
         var raise_0 = new DefaultRaise(false);
         var tmp_3;
         try {
-          var tmp2_0 = this_2.ss_1;
+          var tmp2_0 = this_2.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? this_2.vs_1 : null;
+          var actual_0 = null == null ? this_2.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_3 = new WrongTokenException(tmp2_0, getKClass(WirespecType_0), actual_0);
-          raise_0.vm(this_2.ys());
+          raise_0.vm(this_2.zs());
           raise_0.rm(this_3);
         } catch ($p) {
           var tmp_4;
@@ -3191,7 +3196,7 @@ function EndpointParser$parseEndpointResponse$lambda($this_parseEndpointResponse
 }
 function EndpointParser() {
 }
-protoOf(EndpointParser).dt = function (_this__u8e3s4, comment, annotations) {
+protoOf(EndpointParser).et = function (_this__u8e3s4, comment, annotations) {
   return parseToken(_this__u8e3s4, EndpointParser$parseEndpoint$lambda(_this__u8e3s4, comment, annotations));
 };
 var EndpointParser_instance;
@@ -3206,10 +3211,10 @@ function parseEnumTypeEntries($this, _this__u8e3s4) {
 }
 function EnumParser$parseEnum$lambda($this_parseEnum, $comment, $annotations) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseEnum.vs_1.js_1;
+    var tmp0_subject = $this_parseEnum.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp = $this$parseToken.vm(parseEnumTypeDefinition(EnumParser_instance, $this_parseEnum, $comment, $annotations, new DefinitionIdentifier($this_parseEnum.vs_1.is_1)));
+      tmp = $this$parseToken.vm(parseEnumTypeDefinition(EnumParser_instance, $this_parseEnum, $comment, $annotations, new DefinitionIdentifier($this_parseEnum.ws_1.js_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseEnum;
@@ -3219,12 +3224,12 @@ function EnumParser$parseEnum$lambda($this_parseEnum, $comment, $annotations) {
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(WirespecType_0), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -3254,7 +3259,7 @@ function EnumParser$parseEnum$lambda($this_parseEnum, $comment, $annotations) {
 function EnumParser$parseEnumTypeDefinition$lambda($this_parseEnumTypeDefinition, $comment, $annotations, $typeName) {
   return function ($this$parseToken, it) {
     var tmp;
-    if ($this_parseEnumTypeDefinition.vs_1.js_1 instanceof LeftCurly) {
+    if ($this_parseEnumTypeDefinition.ws_1.ks_1 instanceof LeftCurly) {
       tmp = new Enum_0($comment, $annotations, $typeName, $this$parseToken.vm(parseEnumTypeEntries(EnumParser_instance, $this_parseEnumTypeDefinition)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
@@ -3265,12 +3270,12 @@ function EnumParser$parseEnumTypeDefinition$lambda($this_parseEnumTypeDefinition
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(LeftCurly), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -3296,8 +3301,8 @@ function EnumParser$parseEnumTypeDefinition$lambda($this_parseEnumTypeDefinition
     }
     // Inline function 'kotlin.also' call
     var this_2 = tmp;
-    if ($this_parseEnumTypeDefinition.vs_1.js_1 instanceof RightCurly)
-      $this$parseToken.vm($this_parseEnumTypeDefinition.ys());
+    if ($this_parseEnumTypeDefinition.ws_1.ks_1 instanceof RightCurly)
+      $this$parseToken.vm($this_parseEnumTypeDefinition.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_3 = $this_parseEnumTypeDefinition;
@@ -3307,12 +3312,12 @@ function EnumParser$parseEnumTypeDefinition$lambda($this_parseEnumTypeDefinition
       var raise_0 = new DefaultRaise(false);
       var tmp_2;
       try {
-        var tmp2_0 = this_3.ss_1;
+        var tmp2_0 = this_3.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_3.vs_1 : null;
+        var actual_0 = null == null ? this_3.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_4 = new WrongTokenException(tmp2_0, getKClass(RightCurly), actual_0);
-        raise_0.vm(this_3.ys());
+        raise_0.vm(this_3.zs());
         raise_0.rm(this_4);
       } catch ($p) {
         var tmp_3;
@@ -3340,7 +3345,7 @@ function EnumParser$parseEnumTypeDefinition$lambda($this_parseEnumTypeDefinition
 }
 function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseEnumTypeEntries.vs_1.js_1;
+    var tmp0_subject = $this_parseEnumTypeEntries.ws_1.ks_1;
     var tmp;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecType_0)) {
@@ -3352,11 +3357,11 @@ function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
       // Inline function 'kotlin.collections.mutableListOf' call
       // Inline function 'kotlin.apply' call
       var this_0 = ArrayList_init_$Create$_0();
-      this_0.x($this_parseEnumTypeEntries.vs_1.is_1);
-      $this$parseToken.vm($this_parseEnumTypeEntries.ys());
-      while (equals($this_parseEnumTypeEntries.vs_1.js_1, Comma_instance)) {
-        $this$parseToken.vm($this_parseEnumTypeEntries.ys());
-        var tmp0_subject_0 = $this_parseEnumTypeEntries.vs_1.js_1;
+      this_0.x($this_parseEnumTypeEntries.ws_1.js_1);
+      $this$parseToken.vm($this_parseEnumTypeEntries.zs());
+      while (equals($this_parseEnumTypeEntries.ws_1.ks_1, Comma_instance)) {
+        $this$parseToken.vm($this_parseEnumTypeEntries.zs());
+        var tmp0_subject_0 = $this_parseEnumTypeEntries.ws_1.ks_1;
         var tmp_1;
         if (isInterface(tmp0_subject_0, WirespecType_0)) {
           tmp_1 = true;
@@ -3365,8 +3370,8 @@ function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
         }
         if (tmp_1) {
           // Inline function 'kotlin.also' call
-          this_0.x($this_parseEnumTypeEntries.vs_1.is_1);
-          $this$parseToken.vm($this_parseEnumTypeEntries.ys());
+          this_0.x($this_parseEnumTypeEntries.ws_1.js_1);
+          $this$parseToken.vm($this_parseEnumTypeEntries.zs());
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
           var this_1 = $this_parseEnumTypeEntries;
@@ -3376,12 +3381,12 @@ function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
           var raise = new DefaultRaise(false);
           var tmp_2;
           try {
-            var tmp2 = this_1.ss_1;
+            var tmp2 = this_1.ts_1;
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = null == null ? this_1.vs_1 : null;
+            var actual = null == null ? this_1.ws_1 : null;
             // Inline function 'kotlin.also' call
             var this_2 = new WrongTokenException(tmp2, getKClass(WirespecType_0), actual);
-            raise.vm(this_1.ys());
+            raise.vm(this_1.zs());
             raise.rm(this_2);
           } catch ($p) {
             var tmp_3;
@@ -3416,12 +3421,12 @@ function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
       var raise_0 = new DefaultRaise(false);
       var tmp_4;
       try {
-        var tmp2_0 = this_3.ss_1;
+        var tmp2_0 = this_3.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_3.vs_1 : null;
+        var actual_0 = null == null ? this_3.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_4 = new WrongTokenException(tmp2_0, getKClass(WirespecType_0), actual_0);
-        raise_0.vm(this_3.ys());
+        raise_0.vm(this_3.zs());
         raise_0.rm(this_4);
       } catch ($p) {
         var tmp_5;
@@ -3450,7 +3455,7 @@ function EnumParser$parseEnumTypeEntries$lambda($this_parseEnumTypeEntries) {
 }
 function EnumParser() {
 }
-protoOf(EnumParser).et = function (_this__u8e3s4, comment, annotations) {
+protoOf(EnumParser).ft = function (_this__u8e3s4, comment, annotations) {
   return parseToken(_this__u8e3s4, EnumParser$parseEnum$lambda(_this__u8e3s4, comment, annotations));
 };
 var EnumParser_instance;
@@ -3460,15 +3465,15 @@ function EnumParser_getInstance() {
 function ParseOptions(strict, allowUnions) {
   strict = strict === VOID ? false : strict;
   allowUnions = allowUnions === VOID ? true : allowUnions;
-  this.ft_1 = strict;
-  this.gt_1 = allowUnions;
+  this.gt_1 = strict;
+  this.ht_1 = allowUnions;
 }
 protoOf(ParseOptions).toString = function () {
-  return 'ParseOptions(strict=' + this.ft_1 + ', allowUnions=' + this.gt_1 + ')';
+  return 'ParseOptions(strict=' + this.gt_1 + ', allowUnions=' + this.ht_1 + ')';
 };
 protoOf(ParseOptions).hashCode = function () {
-  var result = getBooleanHashCode(this.ft_1);
-  result = imul(result, 31) + getBooleanHashCode(this.gt_1) | 0;
+  var result = getBooleanHashCode(this.gt_1);
+  result = imul(result, 31) + getBooleanHashCode(this.ht_1) | 0;
   return result;
 };
 protoOf(ParseOptions).equals = function (other) {
@@ -3476,15 +3481,15 @@ protoOf(ParseOptions).equals = function (other) {
     return true;
   if (!(other instanceof ParseOptions))
     return false;
-  if (!(this.ft_1 === other.ft_1))
-    return false;
   if (!(this.gt_1 === other.gt_1))
     return false;
+  if (!(this.ht_1 === other.ht_1))
+    return false;
   return true;
 };
 function Parser() {
 }
-protoOf(Parser).ht = function (_this__u8e3s4, modules, options) {
+protoOf(Parser).it = function (_this__u8e3s4, modules, options) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'arrow.core.raise.fold' call
@@ -3523,7 +3528,7 @@ protoOf(Parser).ht = function (_this__u8e3s4, modules, options) {
     var it = tmp_3.om_1;
     // Inline function 'kotlin.let' call
     var it_0 = new Root(it);
-    var res = raise.vm(Validator_instance.it(options, it_0));
+    var res = raise.vm(Validator_instance.jt(options, it_0));
     raise.nm();
     tmp = new Right(res);
   } catch ($p) {
@@ -3548,7 +3553,7 @@ protoOf(Parser).ht = function (_this__u8e3s4, modules, options) {
 };
 protoOf(Parser).pn = function (_this__u8e3s4, modules, options, $super) {
   options = options === VOID ? new ParseOptions() : options;
-  return $super === VOID ? this.ht(_this__u8e3s4, modules, options) : $super.ht.call(this, _this__u8e3s4, new NonEmptyList(modules), options);
+  return $super === VOID ? this.it(_this__u8e3s4, modules, options) : $super.it.call(this, _this__u8e3s4, new NonEmptyList(modules), options);
 };
 var Parser_instance;
 function Parser_getInstance() {
@@ -3565,7 +3570,7 @@ function parseModule(_this__u8e3s4) {
     // Inline function 'kotlin.apply' call
     var this_0 = ArrayList_init_$Create$_0();
     while (_this__u8e3s4.u()) {
-      var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+      var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
       if (tmp0_subject instanceof Annotation_0)
         this_0.x(parseDefinition(_this__u8e3s4));
       else {
@@ -3575,7 +3580,7 @@ function parseModule(_this__u8e3s4) {
           if (isInterface(tmp0_subject, WirespecDefinition))
             this_0.x(parseDefinition(_this__u8e3s4));
           else {
-            _this__u8e3s4.ys();
+            _this__u8e3s4.zs();
           }
         }
       }
@@ -3721,7 +3726,7 @@ function parseModule(_this__u8e3s4) {
     }
     // Inline function 'kotlin.let' call
     var it_0 = tmp_10.om_1;
-    var res_2 = new Module(_this__u8e3s4.ss_1, it_0);
+    var res_2 = new Module(_this__u8e3s4.ts_1, it_0);
     raise.nm();
     tmp = new Right(res_2);
   } catch ($p) {
@@ -3767,10 +3772,10 @@ function allDefinitions(_this__u8e3s4) {
     var element_0 = _iterator__ex2g4s_0.v();
     var first = element_0.ve();
     var second = element_0.we();
-    var tmp0_subject = first.js_1;
+    var tmp0_subject = first.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, WirespecDefinition)) {
-      tmp = second.is_1;
+      tmp = second.js_1;
     } else {
       tmp = null;
     }
@@ -3791,42 +3796,42 @@ function parseDefinition(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var annotations = raise.vm(AnnotationParser_instance.rs(_this__u8e3s4));
+    var annotations = raise.vm(AnnotationParser_instance.ss(_this__u8e3s4));
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof Comment_0) {
+    if (_this__u8e3s4.ws_1.ks_1 instanceof Comment_0) {
       // Inline function 'kotlin.also' call
-      var this_0 = new Comment(Companion_instance_4.jt(_this__u8e3s4.vs_1.is_1));
-      this_0.kt_1;
-      raise.vm(_this__u8e3s4.ys());
-      tmp_0 = this_0.kt_1;
+      var this_0 = new Comment(Companion_instance_4.kt(_this__u8e3s4.ws_1.js_1));
+      this_0.lt_1;
+      raise.vm(_this__u8e3s4.zs());
+      tmp_0 = this_0.lt_1;
     } else {
       tmp_0 = null;
     }
     var comment = tmp_0;
-    var tmp1_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp1_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_1;
     if (isInterface(tmp1_subject, WirespecDefinition)) {
-      var tmp_2 = _this__u8e3s4.vs_1.js_1;
+      var tmp_2 = _this__u8e3s4.ws_1.ks_1;
       var tmp2_subject = isInterface(tmp_2, WirespecDefinition) ? tmp_2 : THROW_CCE();
       var tmp_3;
       if (tmp2_subject instanceof TypeDefinition) {
         // Inline function 'kotlin.with' call
-        var tmp$ret$3 = TypeParser_instance.lt(_this__u8e3s4, comment, annotations);
+        var tmp$ret$3 = TypeParser_instance.mt(_this__u8e3s4, comment, annotations);
         tmp_3 = raise.vm(tmp$ret$3);
       } else {
         if (tmp2_subject instanceof EnumTypeDefinition) {
           // Inline function 'kotlin.with' call
-          var tmp$ret$5 = EnumParser_instance.et(_this__u8e3s4, comment, annotations);
+          var tmp$ret$5 = EnumParser_instance.ft(_this__u8e3s4, comment, annotations);
           tmp_3 = raise.vm(tmp$ret$5);
         } else {
           if (tmp2_subject instanceof EndpointDefinition) {
             // Inline function 'kotlin.with' call
-            var tmp$ret$7 = EndpointParser_instance.dt(_this__u8e3s4, comment, annotations);
+            var tmp$ret$7 = EndpointParser_instance.et(_this__u8e3s4, comment, annotations);
             tmp_3 = raise.vm(tmp$ret$7);
           } else {
             if (tmp2_subject instanceof ChannelDefinition) {
               // Inline function 'kotlin.with' call
-              var tmp$ret$9 = ChannelParser_instance.bt(_this__u8e3s4, comment, annotations);
+              var tmp$ret$9 = ChannelParser_instance.ct(_this__u8e3s4, comment, annotations);
               tmp_3 = raise.vm(tmp$ret$9);
             } else {
               noWhenBranchMatchedException();
@@ -3843,12 +3848,12 @@ function parseDefinition(_this__u8e3s4) {
       var raise_0 = new DefaultRaise(false);
       var tmp_4;
       try {
-        var tmp2 = _this__u8e3s4.ss_1;
+        var tmp2 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(WirespecDefinition), actual);
-        raise_0.vm(_this__u8e3s4.ys());
+        raise_0.vm(_this__u8e3s4.zs());
         raise_0.rm(this_1);
       } catch ($p) {
         var tmp_5;
@@ -3902,7 +3907,7 @@ function parseToken(_this__u8e3s4, block) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var res = block(raise, raise.vm(_this__u8e3s4.ys()));
+    var res = block(raise, raise.vm(_this__u8e3s4.zs()));
     raise.nm();
     tmp = new Right(res);
   } catch ($p) {
@@ -3934,7 +3939,7 @@ function parseModule$lambda($$this$recover) {
 }
 function logToken($this, token) {
   // Inline function 'kotlin.with' call
-  $this.us_1.co("Eating: '" + token.is_1 + "', with type: " + toString(token.js_1) + ', at line ' + token.ks_1.ls_1 + ' position ' + token.ks_1.ms_1);
+  $this.vs_1.co("Eating: '" + token.js_1 + "', with type: " + toString(token.ks_1) + ', at line ' + token.ls_1.ms_1 + ' position ' + token.ls_1.ns_1);
   return Unit_instance;
 }
 function printTokens($this, previousToken) {
@@ -3943,23 +3948,23 @@ function printTokens($this, previousToken) {
     tmp = null;
   } else {
     // Inline function 'kotlin.run' call
-    tmp = "Eating: '" + previousToken.is_1 + "', ";
+    tmp = "Eating: '" + previousToken.js_1 + "', ";
   }
   var tmp1_elvis_lhs = tmp;
   var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
   // Inline function 'kotlin.run' call
-  var curr = "Current: '" + $this.vs_1.is_1 + "'";
-  var tmp2_safe_receiver = $this.xs_1;
+  var curr = "Current: '" + $this.ws_1.js_1 + "'";
+  var tmp2_safe_receiver = $this.ys_1;
   var tmp_0;
   if (tmp2_safe_receiver == null) {
     tmp_0 = null;
   } else {
     // Inline function 'kotlin.run' call
-    tmp_0 = ", Next: '" + tmp2_safe_receiver.is_1 + "'";
+    tmp_0 = ", Next: '" + tmp2_safe_receiver.js_1 + "'";
   }
   var tmp3_elvis_lhs = tmp_0;
   var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-  $this.us_1.co(prev + curr + next);
+  $this.vs_1.co(prev + curr + next);
 }
 function printTokens$default($this, previousToken, $super) {
   previousToken = previousToken === VOID ? null : previousToken;
@@ -3973,7 +3978,7 @@ function nextToken($this) {
     // Inline function 'arrow.core.raise.catch' call
     var tmp;
     try {
-      tmp = $this.ws_1.v();
+      tmp = $this.xs_1.v();
     } catch ($p) {
       var tmp_0;
       if ($p instanceof Error) {
@@ -3991,18 +3996,18 @@ function nextToken($this) {
   return tmp$ret$3.em();
 }
 function TokenProvider(tokens, fileUri, definitionNames, logger) {
-  this.ss_1 = fileUri;
-  this.ts_1 = definitionNames;
-  this.us_1 = logger;
-  this.vs_1 = _NonEmptyList___get_head__impl__q9oenq(tokens);
-  this.ws_1 = _NonEmptyList___get_tail__impl__t91bd2(tokens).t();
-  this.xs_1 = nextToken(this);
+  this.ts_1 = fileUri;
+  this.us_1 = definitionNames;
+  this.vs_1 = logger;
+  this.ws_1 = _NonEmptyList___get_head__impl__q9oenq(tokens);
+  this.xs_1 = _NonEmptyList___get_tail__impl__t91bd2(tokens).t();
+  this.ys_1 = nextToken(this);
   printTokens$default(this);
 }
 protoOf(TokenProvider).u = function () {
-  return !(this.xs_1 == null);
+  return !(this.ys_1 == null);
 };
-protoOf(TokenProvider).ys = function () {
+protoOf(TokenProvider).zs = function () {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'arrow.core.raise.fold' call
@@ -4010,19 +4015,19 @@ protoOf(TokenProvider).ys = function () {
   var tmp;
   try {
     // Inline function 'kotlin.also' call
-    var this_0 = this.vs_1;
+    var this_0 = this.ws_1;
     logToken(this, this_0);
     var previousToken = this_0;
     var tmp_0 = this;
-    var tmp0_elvis_lhs = this.xs_1;
+    var tmp0_elvis_lhs = this.ys_1;
     var tmp_1;
     if (tmp0_elvis_lhs == null) {
-      raise.rm(new NextException(this.ss_1, previousToken.ks_1));
+      raise.rm(new NextException(this.ts_1, previousToken.ls_1));
     } else {
       tmp_1 = tmp0_elvis_lhs;
     }
-    tmp_0.vs_1 = tmp_1;
-    this.xs_1 = nextToken(this);
+    tmp_0.ws_1 = tmp_1;
+    this.ys_1 = nextToken(this);
     printTokens(this, previousToken);
     var res = previousToken;
     raise.nm();
@@ -4047,7 +4052,7 @@ protoOf(TokenProvider).ys = function () {
   }
   return tmp;
 };
-protoOf(TokenProvider).mt = function (_this__u8e3s4) {
+protoOf(TokenProvider).nt = function (_this__u8e3s4) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'arrow.core.raise.fold' call
@@ -4056,10 +4061,10 @@ protoOf(TokenProvider).mt = function (_this__u8e3s4) {
   try {
     // Inline function 'arrow.core.raise.ensure' call
     var tmp_0;
-    if (this.ts_1.u1(_this__u8e3s4.is_1)) {
+    if (this.us_1.u1(_this__u8e3s4.js_1)) {
       tmp_0 = Unit_instance;
     } else {
-      raise.rm(new DefinitionNotExistsException(this.ss_1, _this__u8e3s4.is_1, _this__u8e3s4.ks_1));
+      raise.rm(new DefinitionNotExistsException(this.ts_1, _this__u8e3s4.js_1, _this__u8e3s4.ls_1));
     }
     var res = _this__u8e3s4;
     raise.nm();
@@ -4089,10 +4094,10 @@ function toProvider(_this__u8e3s4, definitionNames, logger) {
 }
 function TypeParser$parseType$lambda($this_parseType, $comment, $annotations) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseType.vs_1.js_1;
+    var tmp0_subject = $this_parseType.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, TypeIdentifier)) {
-      tmp = $this$parseToken.vm(parseTypeDefinition($this_parseType, $comment, $annotations, new DefinitionIdentifier($this_parseType.vs_1.is_1)));
+      tmp = $this$parseToken.vm(parseTypeDefinition($this_parseType, $comment, $annotations, new DefinitionIdentifier($this_parseType.ws_1.js_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseType;
@@ -4102,12 +4107,12 @@ function TypeParser$parseType$lambda($this_parseType, $comment, $annotations) {
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(TypeIdentifier), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_1;
@@ -4139,10 +4144,10 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
     // Inline function 'kotlin.collections.mutableListOf' call
     // Inline function 'kotlin.apply' call
     var this_0 = ArrayList_init_$Create$_0();
-    var firstFieldAnnotations = $this$parseToken.vm(AnnotationParser_instance.rs($this_parseTypeShape));
-    var tmp0_subject = $this_parseTypeShape.vs_1.js_1;
+    var firstFieldAnnotations = $this$parseToken.vm(AnnotationParser_instance.ss($this_parseTypeShape));
+    var tmp0_subject = $this_parseTypeShape.ws_1.ks_1;
     if (isInterface(tmp0_subject, WirespecIdentifier))
-      this_0.x($this$parseToken.vm(parseField($this_parseTypeShape, new FieldIdentifier($this_parseTypeShape.vs_1.is_1), firstFieldAnnotations)));
+      this_0.x($this$parseToken.vm(parseField($this_parseTypeShape, new FieldIdentifier($this_parseTypeShape.ws_1.js_1), firstFieldAnnotations)));
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_1 = $this_parseTypeShape;
@@ -4152,12 +4157,12 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_1.ss_1;
+        var tmp2 = this_1.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_1.vs_1 : null;
+        var actual = null == null ? this_1.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2, getKClass(WirespecIdentifier), actual);
-        raise.vm(this_1.ys());
+        raise.vm(this_1.zs());
         raise.rm(this_2);
       } catch ($p) {
         var tmp_0;
@@ -4182,15 +4187,15 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
       throwKotlinNothingValueException();
     }
     $l$loop: while (true) {
-      var tmp_1 = $this_parseTypeShape.vs_1.js_1;
+      var tmp_1 = $this_parseTypeShape.ws_1.ks_1;
       if (!(tmp_1 instanceof Comma)) {
         break $l$loop;
       }
-      $this$parseToken.vm($this_parseTypeShape.ys());
-      var fieldAnnotations = $this$parseToken.vm(AnnotationParser_instance.rs($this_parseTypeShape));
-      var tmp1_subject = $this_parseTypeShape.vs_1.js_1;
+      $this$parseToken.vm($this_parseTypeShape.zs());
+      var fieldAnnotations = $this$parseToken.vm(AnnotationParser_instance.ss($this_parseTypeShape));
+      var tmp1_subject = $this_parseTypeShape.ws_1.ks_1;
       if (isInterface(tmp1_subject, WirespecIdentifier))
-        this_0.x($this$parseToken.vm(parseField($this_parseTypeShape, new FieldIdentifier($this_parseTypeShape.vs_1.is_1), fieldAnnotations)));
+        this_0.x($this$parseToken.vm(parseField($this_parseTypeShape, new FieldIdentifier($this_parseTypeShape.ws_1.js_1), fieldAnnotations)));
       else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_3 = $this_parseTypeShape;
@@ -4200,12 +4205,12 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
         var raise_0 = new DefaultRaise(false);
         var tmp_2;
         try {
-          var tmp2_0 = this_3.ss_1;
+          var tmp2_0 = this_3.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? this_3.vs_1 : null;
+          var actual_0 = null == null ? this_3.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_4 = new WrongTokenException(tmp2_0, getKClass(WirespecIdentifier), actual_0);
-          raise_0.vm(this_3.ys());
+          raise_0.vm(this_3.zs());
           raise_0.rm(this_4);
         } catch ($p) {
           var tmp_3;
@@ -4231,8 +4236,8 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
       }
     }
     // Inline function 'kotlin.also' call
-    if ($this_parseTypeShape.vs_1.js_1 instanceof RightCurly)
-      $this$parseToken.vm($this_parseTypeShape.ys());
+    if ($this_parseTypeShape.ws_1.ks_1 instanceof RightCurly)
+      $this$parseToken.vm($this_parseTypeShape.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_5 = $this_parseTypeShape;
@@ -4242,12 +4247,12 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
       var raise_1 = new DefaultRaise(false);
       var tmp_4;
       try {
-        var tmp2_1 = this_5.ss_1;
+        var tmp2_1 = this_5.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = null == null ? this_5.vs_1 : null;
+        var actual_1 = null == null ? this_5.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_6 = new WrongTokenException(tmp2_1, getKClass(RightCurly), actual_1);
-        raise_1.vm(this_5.ys());
+        raise_1.vm(this_5.zs());
         raise_1.rm(this_6);
       } catch ($p) {
         var tmp_5;
@@ -4276,13 +4281,13 @@ function TypeParser$parseTypeShape$lambda($this_parseTypeShape) {
 }
 function TypeParser$parseDict$lambda($this_parseDict) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseDict.vs_1.js_1;
+    var tmp0_subject = $this_parseDict.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      var tmp_0 = $this$parseToken.vm(TypeParser_instance.zs($this_parseDict));
+      var tmp_0 = $this$parseToken.vm(TypeParser_instance.at($this_parseDict));
       var tmp_1;
-      if ($this_parseDict.vs_1.js_1 instanceof RightCurly) {
-        $this$parseToken.vm($this_parseDict.ys());
+      if ($this_parseDict.ws_1.ks_1 instanceof RightCurly) {
+        $this$parseToken.vm($this_parseDict.zs());
         tmp_1 = $this$parseToken.vm(isNullable($this_parseDict));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
@@ -4293,12 +4298,12 @@ function TypeParser$parseDict$lambda($this_parseDict) {
         var raise = new DefaultRaise(false);
         var tmp_2;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(RightCurly), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_3;
@@ -4332,12 +4337,12 @@ function TypeParser$parseDict$lambda($this_parseDict) {
       var raise_0 = new DefaultRaise(false);
       var tmp_4;
       try {
-        var tmp2_0 = this_2.ss_1;
+        var tmp2_0 = this_2.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_2.vs_1 : null;
+        var actual_0 = null == null ? this_2.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_3 = new WrongTokenException(tmp2_0, getKClass(WirespecType_0), actual_0);
-        raise_0.vm(this_2.ys());
+        raise_0.vm(this_2.zs());
         raise_0.rm(this_3);
       } catch ($p) {
         var tmp_5;
@@ -4366,7 +4371,7 @@ function TypeParser$parseDict$lambda($this_parseDict) {
 }
 function TypeParser$parseType$lambda_0($this_parseType) {
   return function ($this$parseToken, previousToken) {
-    var tmp0_subject = previousToken.js_1;
+    var tmp0_subject = previousToken.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, PrimitiveType)) {
       tmp = $this$parseToken.vm(parsePrimitiveType($this_parseType, previousToken));
@@ -4375,7 +4380,7 @@ function TypeParser$parseType$lambda_0($this_parseType) {
         tmp = new Unit($this$parseToken.vm(isNullable($this_parseType)));
       } else {
         if (isInterface(tmp0_subject, TypeIdentifier)) {
-          tmp = new Custom($this$parseToken.vm($this_parseType.mt(previousToken)).is_1, $this$parseToken.vm(isNullable($this_parseType)));
+          tmp = new Custom($this$parseToken.vm($this_parseType.nt(previousToken)).js_1, $this$parseToken.vm(isNullable($this_parseType)));
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
           var this_0 = $this_parseType;
@@ -4385,12 +4390,12 @@ function TypeParser$parseType$lambda_0($this_parseType) {
           var raise = new DefaultRaise(false);
           var tmp_0;
           try {
-            var tmp2 = this_0.ss_1;
+            var tmp2 = this_0.ts_1;
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = previousToken == null ? this_0.vs_1 : previousToken;
+            var actual = previousToken == null ? this_0.ws_1 : previousToken;
             // Inline function 'kotlin.also' call
             var this_1 = new WrongTokenException(tmp2, getKClass(TypeDefinitionStart), actual);
-            raise.vm(this_0.ys());
+            raise.vm(this_0.zs());
             raise.rm(this_1);
           } catch ($p) {
             var tmp_1;
@@ -4418,8 +4423,8 @@ function TypeParser$parseType$lambda_0($this_parseType) {
     }
     var reference = tmp;
     var tmp_2;
-    if ($this_parseType.vs_1.js_1 instanceof Brackets) {
-      $this$parseToken.vm($this_parseType.ys());
+    if ($this_parseType.ws_1.ks_1 instanceof Brackets) {
+      $this$parseToken.vm($this_parseType.zs());
       tmp_2 = new Iterable(reference, $this$parseToken.vm(isNullable($this_parseType)));
     } else {
       tmp_2 = reference;
@@ -4429,16 +4434,16 @@ function TypeParser$parseType$lambda_0($this_parseType) {
 }
 function TypeParser() {
 }
-protoOf(TypeParser).lt = function (_this__u8e3s4, comment, annotations) {
+protoOf(TypeParser).mt = function (_this__u8e3s4, comment, annotations) {
   return parseToken(_this__u8e3s4, TypeParser$parseType$lambda(_this__u8e3s4, comment, annotations));
 };
-protoOf(TypeParser).ct = function (_this__u8e3s4) {
+protoOf(TypeParser).dt = function (_this__u8e3s4) {
   return parseToken(_this__u8e3s4, TypeParser$parseTypeShape$lambda(_this__u8e3s4));
 };
-protoOf(TypeParser).at = function (_this__u8e3s4) {
+protoOf(TypeParser).bt = function (_this__u8e3s4) {
   return parseToken(_this__u8e3s4, TypeParser$parseDict$lambda(_this__u8e3s4));
 };
-protoOf(TypeParser).zs = function (_this__u8e3s4) {
+protoOf(TypeParser).at = function (_this__u8e3s4) {
   return parseToken(_this__u8e3s4, TypeParser$parseType$lambda_0(_this__u8e3s4));
 };
 var TypeParser_instance;
@@ -4459,9 +4464,9 @@ function isNullable(_this__u8e3s4) {
   var tmp;
   try {
     var tmp_0;
-    if (_this__u8e3s4.vs_1.js_1 instanceof QuestionMark) {
+    if (_this__u8e3s4.ws_1.ks_1 instanceof QuestionMark) {
       // Inline function 'kotlin.also' call
-      raise.vm(_this__u8e3s4.ys());
+      raise.vm(_this__u8e3s4.zs());
       tmp_0 = true;
     } else {
       tmp_0 = false;
@@ -4496,14 +4501,14 @@ function parsePrimitiveType(_this__u8e3s4, previousToken) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var type = previousToken.js_1;
+    var type = previousToken.ks_1;
     var tmp_0;
     if (type instanceof WsString) {
       var tmp1_isNullable = raise.vm(isNullable(_this__u8e3s4));
       var tmp_1;
-      if (_this__u8e3s4.vs_1.js_1 instanceof LeftParenthesis) {
+      if (_this__u8e3s4.ws_1.ks_1 instanceof LeftParenthesis) {
         var tmp_2 = raise.vm(parseTypeConstraint(_this__u8e3s4));
-        tmp_1 = tmp_2 == null ? null : tmp_2.pt_1;
+        tmp_1 = tmp_2 == null ? null : tmp_2.qt_1;
       } else {
         tmp_1 = null;
       }
@@ -4514,9 +4519,9 @@ function parsePrimitiveType(_this__u8e3s4, previousToken) {
         tmp_0 = new Primitive(Bytes_instance, raise.vm(isNullable(_this__u8e3s4)));
       } else {
         if (type instanceof WsInteger) {
-          var tmp_3 = toPrimitivePrecision(type.ot_1);
+          var tmp_3 = toPrimitivePrecision(type.pt_1);
           var tmp_4;
-          if (_this__u8e3s4.vs_1.js_1 instanceof LeftParenthesis) {
+          if (_this__u8e3s4.ws_1.ks_1 instanceof LeftParenthesis) {
             // Inline function 'community.flock.wirespec.compiler.core.parse.parseTypeBound' call
             var tmp$ret$0 = parseToken(_this__u8e3s4, parsePrimitiveType$lambda(_this__u8e3s4));
             tmp_4 = raise.vm(tmp$ret$0);
@@ -4526,9 +4531,9 @@ function parsePrimitiveType(_this__u8e3s4, previousToken) {
           tmp_0 = new Primitive(new Integer(tmp_3, tmp_4), raise.vm(isNullable(_this__u8e3s4)));
         } else {
           if (type instanceof WsNumber) {
-            var tmp_5 = toPrimitivePrecision(type.nt_1);
+            var tmp_5 = toPrimitivePrecision(type.ot_1);
             var tmp_6;
-            if (_this__u8e3s4.vs_1.js_1 instanceof LeftParenthesis) {
+            if (_this__u8e3s4.ws_1.ks_1 instanceof LeftParenthesis) {
               // Inline function 'community.flock.wirespec.compiler.core.parse.parseTypeBound' call
               var tmp$ret$1 = parseToken(_this__u8e3s4, parsePrimitiveType$lambda_0(_this__u8e3s4));
               tmp_6 = raise.vm(tmp$ret$1);
@@ -4547,12 +4552,12 @@ function parsePrimitiveType(_this__u8e3s4, previousToken) {
               var raise_0 = new DefaultRaise(false);
               var tmp_7;
               try {
-                var tmp2 = _this__u8e3s4.ss_1;
+                var tmp2 = _this__u8e3s4.ts_1;
                 // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-                var actual = null == null ? _this__u8e3s4.vs_1 : null;
+                var actual = null == null ? _this__u8e3s4.ws_1 : null;
                 // Inline function 'kotlin.also' call
                 var this_0 = new WrongTokenException(tmp2, getKClass(PrimitiveType), actual);
-                raise_0.vm(_this__u8e3s4.ys());
+                raise_0.vm(_this__u8e3s4.zs());
                 raise_0.rm(this_0);
               } catch ($p) {
                 var tmp_8;
@@ -4631,10 +4636,10 @@ function parseRefined(_this__u8e3s4, comment, annotations, identifier) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_0;
     if (isInterface(tmp0_subject, PrimitiveType)) {
-      tmp_0 = new Refined(comment, annotations, identifier, raise.vm(parsePrimitiveType(_this__u8e3s4, raise.vm(_this__u8e3s4.ys()))));
+      tmp_0 = new Refined(comment, annotations, identifier, raise.vm(parsePrimitiveType(_this__u8e3s4, raise.vm(_this__u8e3s4.zs()))));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       // Inline function 'arrow.core.raise.either' call
@@ -4643,12 +4648,12 @@ function parseRefined(_this__u8e3s4, comment, annotations, identifier) {
       var raise_0 = new DefaultRaise(false);
       var tmp_1;
       try {
-        var tmp2 = _this__u8e3s4.ss_1;
+        var tmp2 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_0 = new WrongTokenException(tmp2, getKClass(SpecificType), actual);
-        raise_0.vm(_this__u8e3s4.ys());
+        raise_0.vm(_this__u8e3s4.zs());
         raise_0.rm(this_0);
       } catch ($p) {
         var tmp_2;
@@ -4732,23 +4737,23 @@ function parseUnionTypeEntries(_this__u8e3s4) {
   var raise = new DefaultRaise(false);
   var tmp;
   try {
-    var tmp0_subject = _this__u8e3s4.vs_1.js_1;
+    var tmp0_subject = _this__u8e3s4.ws_1.ks_1;
     var tmp_0;
     if (isInterface(tmp0_subject, TypeIdentifier)) {
       // Inline function 'kotlin.collections.mutableListOf' call
       // Inline function 'kotlin.apply' call
       var this_0 = ArrayList_init_$Create$_0();
-      raise.vm(_this__u8e3s4.mt(_this__u8e3s4.vs_1));
-      this_0.x(new Custom(_this__u8e3s4.vs_1.is_1, false));
-      raise.vm(_this__u8e3s4.ys());
-      while (equals(_this__u8e3s4.vs_1.js_1, Pipe_instance)) {
-        raise.vm(_this__u8e3s4.ys());
-        var tmp0_subject_0 = _this__u8e3s4.vs_1.js_1;
+      raise.vm(_this__u8e3s4.nt(_this__u8e3s4.ws_1));
+      this_0.x(new Custom(_this__u8e3s4.ws_1.js_1, false));
+      raise.vm(_this__u8e3s4.zs());
+      while (equals(_this__u8e3s4.ws_1.ks_1, Pipe_instance)) {
+        raise.vm(_this__u8e3s4.zs());
+        var tmp0_subject_0 = _this__u8e3s4.ws_1.ks_1;
         if (isInterface(tmp0_subject_0, TypeIdentifier)) {
-          raise.vm(_this__u8e3s4.mt(_this__u8e3s4.vs_1));
+          raise.vm(_this__u8e3s4.nt(_this__u8e3s4.ws_1));
           // Inline function 'kotlin.also' call
-          this_0.x(new Custom(_this__u8e3s4.vs_1.is_1, false));
-          raise.vm(_this__u8e3s4.ys());
+          this_0.x(new Custom(_this__u8e3s4.ws_1.js_1, false));
+          raise.vm(_this__u8e3s4.zs());
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
           // Inline function 'arrow.core.raise.either' call
@@ -4757,12 +4762,12 @@ function parseUnionTypeEntries(_this__u8e3s4) {
           var raise_0 = new DefaultRaise(false);
           var tmp_1;
           try {
-            var tmp2 = _this__u8e3s4.ss_1;
+            var tmp2 = _this__u8e3s4.ts_1;
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = null == null ? _this__u8e3s4.vs_1 : null;
+            var actual = null == null ? _this__u8e3s4.ws_1 : null;
             // Inline function 'kotlin.also' call
             var this_1 = new WrongTokenException(tmp2, getKClass(TypeIdentifier), actual);
-            raise_0.vm(_this__u8e3s4.ys());
+            raise_0.vm(_this__u8e3s4.zs());
             raise_0.rm(this_1);
           } catch ($p) {
             var tmp_2;
@@ -4796,12 +4801,12 @@ function parseUnionTypeEntries(_this__u8e3s4) {
       var raise_1 = new DefaultRaise(false);
       var tmp_3;
       try {
-        var tmp2_0 = _this__u8e3s4.ss_1;
+        var tmp2_0 = _this__u8e3s4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? _this__u8e3s4.vs_1 : null;
+        var actual_0 = null == null ? _this__u8e3s4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2_0, getKClass(TypeIdentifier), actual_0);
-        raise_1.vm(_this__u8e3s4.ys());
+        raise_1.vm(_this__u8e3s4.zs());
         raise_1.rm(this_2);
       } catch ($p) {
         var tmp_4;
@@ -4850,13 +4855,13 @@ function parseUnionTypeEntries(_this__u8e3s4) {
 }
 function parseTypeDefinition$lambda($this_parseTypeDefinition, $comment, $annotations, $typeName) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseTypeDefinition.vs_1.js_1;
+    var tmp0_subject = $this_parseTypeDefinition.ws_1.ks_1;
     var tmp;
     if (tmp0_subject instanceof Equals) {
       tmp = $this$parseToken.vm(parseRefinedOrUnion($this_parseTypeDefinition, $comment, $annotations, $typeName));
     } else {
       if (tmp0_subject instanceof LeftCurly) {
-        tmp = new Type($comment, $annotations, $typeName, $this$parseToken.vm(TypeParser_instance.ct($this_parseTypeDefinition)), emptyList());
+        tmp = new Type($comment, $annotations, $typeName, $this$parseToken.vm(TypeParser_instance.dt($this_parseTypeDefinition)), emptyList());
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
         var this_0 = $this_parseTypeDefinition;
@@ -4866,12 +4871,12 @@ function parseTypeDefinition$lambda($this_parseTypeDefinition, $comment, $annota
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(TypeDefinitionStart), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -4901,8 +4906,8 @@ function parseTypeDefinition$lambda($this_parseTypeDefinition, $comment, $annota
 }
 function parseField$lambda($this_parseField, $annotations, $identifier) {
   return function ($this$parseToken, it) {
-    if ($this_parseField.vs_1.js_1 instanceof Colon)
-      $this$parseToken.vm($this_parseField.ys());
+    if ($this_parseField.ws_1.ks_1 instanceof Colon)
+      $this$parseToken.vm($this_parseField.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_0 = $this_parseField;
@@ -4912,12 +4917,12 @@ function parseField$lambda($this_parseField, $annotations, $identifier) {
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_0.ss_1;
+        var tmp2 = this_0.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_0.vs_1 : null;
+        var actual = null == null ? this_0.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(tmp2, getKClass(Colon), actual);
-        raise.vm(this_0.ys());
+        raise.vm(this_0.zs());
         raise.rm(this_1);
       } catch ($p) {
         var tmp_0;
@@ -4941,14 +4946,14 @@ function parseField$lambda($this_parseField, $annotations, $identifier) {
       $this$parseToken.vm(tmp$ret$8);
       throwKotlinNothingValueException();
     }
-    var tmp1_subject = $this_parseField.vs_1.js_1;
+    var tmp1_subject = $this_parseField.ws_1.ks_1;
     var tmp_1;
     if (tmp1_subject instanceof LeftCurly) {
-      var tmp2_reference = $this$parseToken.vm(TypeParser_instance.at($this_parseField));
+      var tmp2_reference = $this$parseToken.vm(TypeParser_instance.bt($this_parseField));
       tmp_1 = new Field($annotations, $identifier, tmp2_reference);
     } else {
       if (isInterface(tmp1_subject, WirespecType_0)) {
-        var tmp3_reference = $this$parseToken.vm(TypeParser_instance.zs($this_parseField));
+        var tmp3_reference = $this$parseToken.vm(TypeParser_instance.at($this_parseField));
         tmp_1 = new Field($annotations, $identifier, tmp3_reference);
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
@@ -4959,12 +4964,12 @@ function parseField$lambda($this_parseField, $annotations, $identifier) {
         var raise_0 = new DefaultRaise(false);
         var tmp_2;
         try {
-          var tmp2_0 = this_2.ss_1;
+          var tmp2_0 = this_2.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = null == null ? this_2.vs_1 : null;
+          var actual_0 = null == null ? this_2.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_3 = new WrongTokenException(tmp2_0, getKClass(WirespecType_0), actual_0);
-          raise_0.vm(this_2.ys());
+          raise_0.vm(this_2.zs());
           raise_0.rm(this_3);
         } catch ($p) {
           var tmp_3;
@@ -4994,10 +4999,10 @@ function parseField$lambda($this_parseField, $annotations, $identifier) {
 }
 function parsePrimitiveType$lambda$lambda($this) {
   return function ($this$parseToken, previousToken) {
-    var tmp0_subject = previousToken.js_1;
+    var tmp0_subject = previousToken.ks_1;
     var tmp;
     if (tmp0_subject instanceof Integer_0) {
-      tmp = previousToken.is_1;
+      tmp = previousToken.js_1;
     } else {
       if (tmp0_subject instanceof Underscore) {
         tmp = null;
@@ -5010,12 +5015,12 @@ function parsePrimitiveType$lambda$lambda($this) {
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(Integer_0), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -5045,10 +5050,10 @@ function parsePrimitiveType$lambda$lambda($this) {
 }
 function parsePrimitiveType$lambda$lambda_0($this) {
   return function ($this$parseToken, previousToken) {
-    var tmp0_subject = previousToken.js_1;
+    var tmp0_subject = previousToken.ks_1;
     var tmp;
     if (tmp0_subject instanceof Integer_0) {
-      tmp = previousToken.is_1;
+      tmp = previousToken.js_1;
     } else {
       if (tmp0_subject instanceof Underscore) {
         tmp = null;
@@ -5061,12 +5066,12 @@ function parsePrimitiveType$lambda$lambda_0($this) {
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(Integer_0), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -5100,8 +5105,8 @@ function parsePrimitiveType$lambda($this) {
     var this_0 = $this;
     var tmp$ret$0 = parseToken(this_0, parsePrimitiveType$lambda$lambda(this_0));
     var min = $this$parseToken.vm(tmp$ret$0);
-    if ($this.vs_1.js_1 instanceof Comma)
-      $this$parseToken.vm($this.ys());
+    if ($this.ws_1.ks_1 instanceof Comma)
+      $this$parseToken.vm($this.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_1 = $this;
@@ -5111,12 +5116,12 @@ function parsePrimitiveType$lambda($this) {
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_1.ss_1;
+        var tmp2 = this_1.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_1.vs_1 : null;
+        var actual = null == null ? this_1.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2, getKClass(Comma), actual);
-        raise.vm(this_1.ys());
+        raise.vm(this_1.zs());
         raise.rm(this_2);
       } catch ($p) {
         var tmp_0;
@@ -5144,8 +5149,8 @@ function parsePrimitiveType$lambda($this) {
     var this_3 = $this;
     var tmp$ret$10 = parseToken(this_3, parsePrimitiveType$lambda$lambda_0(this_3));
     var max = $this$parseToken.vm(tmp$ret$10);
-    if ($this.vs_1.js_1 instanceof RightParenthesis)
-      $this$parseToken.vm($this.ys());
+    if ($this.ws_1.ks_1 instanceof RightParenthesis)
+      $this$parseToken.vm($this.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_4 = $this;
@@ -5155,12 +5160,12 @@ function parsePrimitiveType$lambda($this) {
       var raise_0 = new DefaultRaise(false);
       var tmp_1;
       try {
-        var tmp2_0 = this_4.ss_1;
+        var tmp2_0 = this_4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_4.vs_1 : null;
+        var actual_0 = null == null ? this_4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_5 = new WrongTokenException(tmp2_0, getKClass(RightParenthesis), actual_0);
-        raise_0.vm(this_4.ys());
+        raise_0.vm(this_4.zs());
         raise_0.rm(this_5);
       } catch ($p) {
         var tmp_2;
@@ -5189,10 +5194,10 @@ function parsePrimitiveType$lambda($this) {
 }
 function parsePrimitiveType$lambda$lambda_1($this) {
   return function ($this$parseToken, previousToken) {
-    var tmp0_subject = previousToken.js_1;
+    var tmp0_subject = previousToken.ks_1;
     var tmp;
     if (tmp0_subject instanceof Number_1) {
-      tmp = previousToken.is_1;
+      tmp = previousToken.js_1;
     } else {
       if (tmp0_subject instanceof Underscore) {
         tmp = null;
@@ -5205,12 +5210,12 @@ function parsePrimitiveType$lambda$lambda_1($this) {
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(Number_1), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -5240,10 +5245,10 @@ function parsePrimitiveType$lambda$lambda_1($this) {
 }
 function parsePrimitiveType$lambda$lambda_2($this) {
   return function ($this$parseToken, previousToken) {
-    var tmp0_subject = previousToken.js_1;
+    var tmp0_subject = previousToken.ks_1;
     var tmp;
     if (tmp0_subject instanceof Number_1) {
-      tmp = previousToken.is_1;
+      tmp = previousToken.js_1;
     } else {
       if (tmp0_subject instanceof Underscore) {
         tmp = null;
@@ -5256,12 +5261,12 @@ function parsePrimitiveType$lambda$lambda_2($this) {
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(Number_1), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -5295,8 +5300,8 @@ function parsePrimitiveType$lambda_0($this) {
     var this_0 = $this;
     var tmp$ret$0 = parseToken(this_0, parsePrimitiveType$lambda$lambda_1(this_0));
     var min = $this$parseToken.vm(tmp$ret$0);
-    if ($this.vs_1.js_1 instanceof Comma)
-      $this$parseToken.vm($this.ys());
+    if ($this.ws_1.ks_1 instanceof Comma)
+      $this$parseToken.vm($this.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_1 = $this;
@@ -5306,12 +5311,12 @@ function parsePrimitiveType$lambda_0($this) {
       var raise = new DefaultRaise(false);
       var tmp;
       try {
-        var tmp2 = this_1.ss_1;
+        var tmp2 = this_1.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_1.vs_1 : null;
+        var actual = null == null ? this_1.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2, getKClass(Comma), actual);
-        raise.vm(this_1.ys());
+        raise.vm(this_1.zs());
         raise.rm(this_2);
       } catch ($p) {
         var tmp_0;
@@ -5339,8 +5344,8 @@ function parsePrimitiveType$lambda_0($this) {
     var this_3 = $this;
     var tmp$ret$10 = parseToken(this_3, parsePrimitiveType$lambda$lambda_2(this_3));
     var max = $this$parseToken.vm(tmp$ret$10);
-    if ($this.vs_1.js_1 instanceof RightParenthesis)
-      $this$parseToken.vm($this.ys());
+    if ($this.ws_1.ks_1 instanceof RightParenthesis)
+      $this$parseToken.vm($this.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_4 = $this;
@@ -5350,12 +5355,12 @@ function parsePrimitiveType$lambda_0($this) {
       var raise_0 = new DefaultRaise(false);
       var tmp_1;
       try {
-        var tmp2_0 = this_4.ss_1;
+        var tmp2_0 = this_4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_4.vs_1 : null;
+        var actual_0 = null == null ? this_4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_5 = new WrongTokenException(tmp2_0, getKClass(RightParenthesis), actual_0);
-        raise_0.vm(this_4.ys());
+        raise_0.vm(this_4.zs());
         raise_0.rm(this_5);
       } catch ($p) {
         var tmp_2;
@@ -5384,7 +5389,7 @@ function parsePrimitiveType$lambda_0($this) {
 }
 function parseRefinedOrUnion$lambda($this_parseRefinedOrUnion, $comment, $annotations, $identifier) {
   return function ($this$parseToken, it) {
-    var tmp0_subject = $this_parseRefinedOrUnion.vs_1.js_1;
+    var tmp0_subject = $this_parseRefinedOrUnion.ws_1.ks_1;
     var tmp;
     if (isInterface(tmp0_subject, SpecificType)) {
       tmp = $this$parseToken.vm(parseRefined($this_parseRefinedOrUnion, $comment, $annotations, $identifier));
@@ -5400,12 +5405,12 @@ function parseRefinedOrUnion$lambda($this_parseRefinedOrUnion, $comment, $annota
         var raise = new DefaultRaise(false);
         var tmp_0;
         try {
-          var tmp2 = this_0.ss_1;
+          var tmp2 = this_0.ts_1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = null == null ? this_0.vs_1 : null;
+          var actual = null == null ? this_0.ws_1 : null;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(tmp2, getKClass(WirespecType_0), actual);
-          raise.vm(this_0.ys());
+          raise.vm(this_0.zs());
           raise.rm(this_1);
         } catch ($p) {
           var tmp_1;
@@ -5436,12 +5441,12 @@ function parseRefinedOrUnion$lambda($this_parseRefinedOrUnion, $comment, $annota
 function parseTypeConstraint$lambda($this_parseTypeConstraint) {
   return function ($this$parseToken, it) {
     var tmp;
-    if ($this_parseTypeConstraint.vs_1.js_1 instanceof RegExp_1) {
+    if ($this_parseTypeConstraint.ws_1.ks_1 instanceof RegExp_1) {
       // Inline function 'kotlin.also' call
-      var this_0 = new RegExp_0(_RegExp___init__impl__p22noo($this_parseTypeConstraint.vs_1.is_1));
-      this_0.pt_1;
-      $this$parseToken.vm($this_parseTypeConstraint.ys());
-      tmp = this_0.pt_1;
+      var this_0 = new RegExp_0(_RegExp___init__impl__p22noo($this_parseTypeConstraint.ws_1.js_1));
+      this_0.qt_1;
+      $this$parseToken.vm($this_parseTypeConstraint.zs());
+      tmp = this_0.qt_1;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_1 = $this_parseTypeConstraint;
@@ -5451,12 +5456,12 @@ function parseTypeConstraint$lambda($this_parseTypeConstraint) {
       var raise = new DefaultRaise(false);
       var tmp_0;
       try {
-        var tmp2 = this_1.ss_1;
+        var tmp2 = this_1.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = null == null ? this_1.vs_1 : null;
+        var actual = null == null ? this_1.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_2 = new WrongTokenException(tmp2, getKClass(RegExp_1), actual);
-        raise.vm(this_1.ys());
+        raise.vm(this_1.zs());
         raise.rm(this_2);
       } catch ($p) {
         var tmp_1;
@@ -5482,9 +5487,9 @@ function parseTypeConstraint$lambda($this_parseTypeConstraint) {
     }
     // Inline function 'kotlin.also' call
     var this_3 = new RegExp_0(tmp);
-    this_3.pt_1;
-    if ($this_parseTypeConstraint.vs_1.js_1 instanceof RightParenthesis)
-      $this$parseToken.vm($this_parseTypeConstraint.ys());
+    this_3.qt_1;
+    if ($this_parseTypeConstraint.ws_1.ks_1 instanceof RightParenthesis)
+      $this$parseToken.vm($this_parseTypeConstraint.zs());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.parse.raiseWrongToken' call
       var this_4 = $this_parseTypeConstraint;
@@ -5494,12 +5499,12 @@ function parseTypeConstraint$lambda($this_parseTypeConstraint) {
       var raise_0 = new DefaultRaise(false);
       var tmp_2;
       try {
-        var tmp2_0 = this_4.ss_1;
+        var tmp2_0 = this_4.ts_1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = null == null ? this_4.vs_1 : null;
+        var actual_0 = null == null ? this_4.ws_1 : null;
         // Inline function 'kotlin.also' call
         var this_5 = new WrongTokenException(tmp2_0, getKClass(RightParenthesis), actual_0);
-        raise_0.vm(this_4.ys());
+        raise_0.vm(this_4.zs());
         raise_0.rm(this_5);
       } catch ($p) {
         var tmp_3;
@@ -5522,77 +5527,77 @@ function parseTypeConstraint$lambda($this_parseTypeConstraint) {
       var tmp$ret$19 = tmp_2;
       $this$parseToken.vm(tmp$ret$19);
     }
-    var tmp$ret$21 = this_3.pt_1;
+    var tmp$ret$21 = this_3.qt_1;
     return new RegExp_0(tmp$ret$21);
   };
 }
 function Shape(value) {
-  this.ip_1 = value;
+  this.jp_1 = value;
 }
 protoOf(Shape).l1 = function () {
-  return this.ip_1;
+  return this.jp_1;
 };
 protoOf(Shape).toString = function () {
-  return 'Shape(value=' + toString(this.ip_1) + ')';
+  return 'Shape(value=' + toString(this.jp_1) + ')';
 };
 protoOf(Shape).hashCode = function () {
-  return hashCode(this.ip_1);
+  return hashCode(this.jp_1);
 };
 protoOf(Shape).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Shape))
     return false;
-  if (!equals(this.ip_1, other.ip_1))
+  if (!equals(this.jp_1, other.jp_1))
     return false;
   return true;
 };
 function Type(comment, annotations, identifier, shape, extends_0) {
-  this.jp_1 = comment;
-  this.kp_1 = annotations;
-  this.lp_1 = identifier;
-  this.mp_1 = shape;
-  this.np_1 = extends_0;
+  this.kp_1 = comment;
+  this.lp_1 = annotations;
+  this.mp_1 = identifier;
+  this.np_1 = shape;
+  this.op_1 = extends_0;
 }
-protoOf(Type).mr = function () {
-  return this.lp_1;
+protoOf(Type).nr = function () {
+  return this.mp_1;
 };
-protoOf(Type).qt = function (comment, annotations, identifier, shape, extends_0) {
+protoOf(Type).rt = function (comment, annotations, identifier, shape, extends_0) {
   return new Type(comment, annotations, identifier, shape, extends_0);
 };
-protoOf(Type).rt = function (comment, annotations, identifier, shape, extends_0, $super) {
-  comment = comment === VOID ? this.jp_1 : comment;
-  annotations = annotations === VOID ? this.kp_1 : annotations;
-  identifier = identifier === VOID ? this.lp_1 : identifier;
-  shape = shape === VOID ? this.mp_1 : shape;
-  extends_0 = extends_0 === VOID ? this.np_1 : extends_0;
+protoOf(Type).st = function (comment, annotations, identifier, shape, extends_0, $super) {
+  comment = comment === VOID ? this.kp_1 : comment;
+  annotations = annotations === VOID ? this.lp_1 : annotations;
+  identifier = identifier === VOID ? this.mp_1 : identifier;
+  shape = shape === VOID ? this.np_1 : shape;
+  extends_0 = extends_0 === VOID ? this.op_1 : extends_0;
   var tmp;
   if ($super === VOID) {
-    tmp = this.qt(comment, annotations, identifier, shape, extends_0);
+    tmp = this.rt(comment, annotations, identifier, shape, extends_0);
   } else {
-    var tmp_0 = $super.qt;
+    var tmp_0 = $super.rt;
     var tmp_1 = comment;
     tmp = tmp_0.call(this, tmp_1 == null ? null : new Comment(tmp_1), annotations, identifier, shape, extends_0);
   }
   return tmp;
 };
 protoOf(Type).toString = function () {
-  var tmp = this.jp_1;
-  return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.kp_1) + ', identifier=' + this.lp_1.toString() + ', shape=' + this.mp_1.toString() + ', extends=' + toString(this.np_1) + ')';
+  var tmp = this.kp_1;
+  return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.lp_1) + ', identifier=' + this.mp_1.toString() + ', shape=' + this.np_1.toString() + ', extends=' + toString(this.op_1) + ')';
 };
 protoOf(Type).hashCode = function () {
   var tmp;
-  var tmp_0 = this.jp_1;
+  var tmp_0 = this.kp_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.jp_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.kp_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.kp_1) | 0;
-  result = imul(result, 31) + this.lp_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.lp_1) | 0;
   result = imul(result, 31) + this.mp_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.np_1) | 0;
+  result = imul(result, 31) + this.np_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.op_1) | 0;
   return result;
 };
 protoOf(Type).equals = function (other) {
@@ -5600,18 +5605,18 @@ protoOf(Type).equals = function (other) {
     return true;
   if (!(other instanceof Type))
     return false;
-  var tmp = this.jp_1;
+  var tmp = this.kp_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.jp_1;
+  var tmp_1 = other.kp_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.kp_1, other.kp_1))
-    return false;
-  if (!this.lp_1.equals(other.lp_1))
+  if (!equals(this.lp_1, other.lp_1))
     return false;
   if (!this.mp_1.equals(other.mp_1))
     return false;
-  if (!equals(this.np_1, other.np_1))
+  if (!this.np_1.equals(other.np_1))
+    return false;
+  if (!equals(this.op_1, other.op_1))
     return false;
   return true;
 };
@@ -5671,36 +5676,36 @@ function Method_initEntries() {
 }
 var $ENTRIES_0;
 function Literal(value) {
-  this.xq_1 = value;
+  this.yq_1 = value;
 }
 protoOf(Literal).l1 = function () {
-  return this.xq_1;
+  return this.yq_1;
 };
 protoOf(Literal).toString = function () {
-  return 'Literal(value=' + this.xq_1 + ')';
+  return 'Literal(value=' + this.yq_1 + ')';
 };
 protoOf(Literal).hashCode = function () {
-  return getStringHashCode(this.xq_1);
+  return getStringHashCode(this.yq_1);
 };
 protoOf(Literal).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Literal))
     return false;
-  if (!(this.xq_1 === other.xq_1))
+  if (!(this.yq_1 === other.yq_1))
     return false;
   return true;
 };
 function Param_0(identifier, reference) {
-  this.bq_1 = identifier;
-  this.cq_1 = reference;
+  this.cq_1 = identifier;
+  this.dq_1 = reference;
 }
 protoOf(Param_0).toString = function () {
-  return 'Param(identifier=' + this.bq_1.toString() + ', reference=' + toString(this.cq_1) + ')';
+  return 'Param(identifier=' + this.cq_1.toString() + ', reference=' + toString(this.dq_1) + ')';
 };
 protoOf(Param_0).hashCode = function () {
-  var result = this.bq_1.hashCode();
-  result = imul(result, 31) + hashCode(this.cq_1) | 0;
+  var result = this.cq_1.hashCode();
+  result = imul(result, 31) + hashCode(this.dq_1) | 0;
   return result;
 };
 protoOf(Param_0).equals = function (other) {
@@ -5708,9 +5713,9 @@ protoOf(Param_0).equals = function (other) {
     return true;
   if (!(other instanceof Param_0))
     return false;
-  if (!this.bq_1.equals(other.bq_1))
+  if (!this.cq_1.equals(other.cq_1))
     return false;
-  if (!equals(this.cq_1, other.cq_1))
+  if (!equals(this.dq_1, other.dq_1))
     return false;
   return true;
 };
@@ -5718,37 +5723,37 @@ function Method(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function Request(content) {
-  this.dq_1 = content;
+  this.eq_1 = content;
 }
 protoOf(Request).toString = function () {
-  return 'Request(content=' + toString_1(this.dq_1) + ')';
+  return 'Request(content=' + toString_1(this.eq_1) + ')';
 };
 protoOf(Request).hashCode = function () {
-  return this.dq_1 == null ? 0 : this.dq_1.hashCode();
+  return this.eq_1 == null ? 0 : this.eq_1.hashCode();
 };
 protoOf(Request).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Request))
     return false;
-  if (!equals(this.dq_1, other.dq_1))
+  if (!equals(this.eq_1, other.eq_1))
     return false;
   return true;
 };
 function Response(status, headers, content, annotations) {
-  this.gq_1 = status;
-  this.hq_1 = headers;
-  this.iq_1 = content;
-  this.jq_1 = annotations;
+  this.hq_1 = status;
+  this.iq_1 = headers;
+  this.jq_1 = content;
+  this.kq_1 = annotations;
 }
 protoOf(Response).toString = function () {
-  return 'Response(status=' + this.gq_1 + ', headers=' + toString(this.hq_1) + ', content=' + toString_1(this.iq_1) + ', annotations=' + toString(this.jq_1) + ')';
+  return 'Response(status=' + this.hq_1 + ', headers=' + toString(this.iq_1) + ', content=' + toString_1(this.jq_1) + ', annotations=' + toString(this.kq_1) + ')';
 };
 protoOf(Response).hashCode = function () {
-  var result = getStringHashCode(this.gq_1);
-  result = imul(result, 31) + hashCode(this.hq_1) | 0;
-  result = imul(result, 31) + (this.iq_1 == null ? 0 : this.iq_1.hashCode()) | 0;
-  result = imul(result, 31) + hashCode(this.jq_1) | 0;
+  var result = getStringHashCode(this.hq_1);
+  result = imul(result, 31) + hashCode(this.iq_1) | 0;
+  result = imul(result, 31) + (this.jq_1 == null ? 0 : this.jq_1.hashCode()) | 0;
+  result = imul(result, 31) + hashCode(this.kq_1) | 0;
   return result;
 };
 protoOf(Response).equals = function (other) {
@@ -5756,26 +5761,26 @@ protoOf(Response).equals = function (other) {
     return true;
   if (!(other instanceof Response))
     return false;
-  if (!(this.gq_1 === other.gq_1))
-    return false;
-  if (!equals(this.hq_1, other.hq_1))
+  if (!(this.hq_1 === other.hq_1))
     return false;
   if (!equals(this.iq_1, other.iq_1))
     return false;
   if (!equals(this.jq_1, other.jq_1))
     return false;
+  if (!equals(this.kq_1, other.kq_1))
+    return false;
   return true;
 };
 function Content(type, reference) {
-  this.eq_1 = type;
-  this.fq_1 = reference;
+  this.fq_1 = type;
+  this.gq_1 = reference;
 }
 protoOf(Content).toString = function () {
-  return 'Content(type=' + this.eq_1 + ', reference=' + toString(this.fq_1) + ')';
+  return 'Content(type=' + this.fq_1 + ', reference=' + toString(this.gq_1) + ')';
 };
 protoOf(Content).hashCode = function () {
-  var result = getStringHashCode(this.eq_1);
-  result = imul(result, 31) + hashCode(this.fq_1) | 0;
+  var result = getStringHashCode(this.fq_1);
+  result = imul(result, 31) + hashCode(this.gq_1) | 0;
   return result;
 };
 protoOf(Content).equals = function (other) {
@@ -5783,9 +5788,9 @@ protoOf(Content).equals = function (other) {
     return true;
   if (!(other instanceof Content))
     return false;
-  if (!(this.eq_1 === other.eq_1))
+  if (!(this.fq_1 === other.fq_1))
     return false;
-  if (!equals(this.fq_1, other.fq_1))
+  if (!equals(this.gq_1, other.gq_1))
     return false;
   return true;
 };
@@ -5822,63 +5827,63 @@ function Method_TRACE_getInstance() {
   return Method_TRACE_instance;
 }
 function Endpoint(comment, annotations, identifier, method, path, queries, headers, requests, responses) {
-  this.sp_1 = comment;
-  this.tp_1 = annotations;
-  this.up_1 = identifier;
-  this.vp_1 = method;
-  this.wp_1 = path;
-  this.xp_1 = queries;
-  this.yp_1 = headers;
-  this.zp_1 = requests;
-  this.aq_1 = responses;
-}
-protoOf(Endpoint).mr = function () {
-  return this.up_1;
-};
-protoOf(Endpoint).st = function (comment, annotations, identifier, method, path, queries, headers, requests, responses) {
+  this.tp_1 = comment;
+  this.up_1 = annotations;
+  this.vp_1 = identifier;
+  this.wp_1 = method;
+  this.xp_1 = path;
+  this.yp_1 = queries;
+  this.zp_1 = headers;
+  this.aq_1 = requests;
+  this.bq_1 = responses;
+}
+protoOf(Endpoint).nr = function () {
+  return this.vp_1;
+};
+protoOf(Endpoint).tt = function (comment, annotations, identifier, method, path, queries, headers, requests, responses) {
   return new Endpoint(comment, annotations, identifier, method, path, queries, headers, requests, responses);
 };
-protoOf(Endpoint).tt = function (comment, annotations, identifier, method, path, queries, headers, requests, responses, $super) {
-  comment = comment === VOID ? this.sp_1 : comment;
-  annotations = annotations === VOID ? this.tp_1 : annotations;
-  identifier = identifier === VOID ? this.up_1 : identifier;
-  method = method === VOID ? this.vp_1 : method;
-  path = path === VOID ? this.wp_1 : path;
-  queries = queries === VOID ? this.xp_1 : queries;
-  headers = headers === VOID ? this.yp_1 : headers;
-  requests = requests === VOID ? this.zp_1 : requests;
-  responses = responses === VOID ? this.aq_1 : responses;
+protoOf(Endpoint).ut = function (comment, annotations, identifier, method, path, queries, headers, requests, responses, $super) {
+  comment = comment === VOID ? this.tp_1 : comment;
+  annotations = annotations === VOID ? this.up_1 : annotations;
+  identifier = identifier === VOID ? this.vp_1 : identifier;
+  method = method === VOID ? this.wp_1 : method;
+  path = path === VOID ? this.xp_1 : path;
+  queries = queries === VOID ? this.yp_1 : queries;
+  headers = headers === VOID ? this.zp_1 : headers;
+  requests = requests === VOID ? this.aq_1 : requests;
+  responses = responses === VOID ? this.bq_1 : responses;
   var tmp;
   if ($super === VOID) {
-    tmp = this.st(comment, annotations, identifier, method, path, queries, headers, requests, responses);
+    tmp = this.tt(comment, annotations, identifier, method, path, queries, headers, requests, responses);
   } else {
-    var tmp_0 = $super.st;
+    var tmp_0 = $super.tt;
     var tmp_1 = comment;
     tmp = tmp_0.call(this, tmp_1 == null ? null : new Comment(tmp_1), annotations, identifier, method, path, queries, headers, requests, responses);
   }
   return tmp;
 };
 protoOf(Endpoint).toString = function () {
-  var tmp = this.sp_1;
-  return 'Endpoint(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.tp_1) + ', identifier=' + this.up_1.toString() + ', method=' + this.vp_1.toString() + ', path=' + toString(this.wp_1) + ', queries=' + toString(this.xp_1) + ', headers=' + toString(this.yp_1) + ', requests=' + toString(this.zp_1) + ', responses=' + toString(this.aq_1) + ')';
+  var tmp = this.tp_1;
+  return 'Endpoint(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.up_1) + ', identifier=' + this.vp_1.toString() + ', method=' + this.wp_1.toString() + ', path=' + toString(this.xp_1) + ', queries=' + toString(this.yp_1) + ', headers=' + toString(this.zp_1) + ', requests=' + toString(this.aq_1) + ', responses=' + toString(this.bq_1) + ')';
 };
 protoOf(Endpoint).hashCode = function () {
   var tmp;
-  var tmp_0 = this.sp_1;
+  var tmp_0 = this.tp_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.sp_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.tp_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.tp_1) | 0;
-  result = imul(result, 31) + this.up_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.up_1) | 0;
   result = imul(result, 31) + this.vp_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.wp_1) | 0;
+  result = imul(result, 31) + this.wp_1.hashCode() | 0;
   result = imul(result, 31) + hashCode(this.xp_1) | 0;
   result = imul(result, 31) + hashCode(this.yp_1) | 0;
   result = imul(result, 31) + hashCode(this.zp_1) | 0;
   result = imul(result, 31) + hashCode(this.aq_1) | 0;
+  result = imul(result, 31) + hashCode(this.bq_1) | 0;
   return result;
 };
 protoOf(Endpoint).equals = function (other) {
@@ -5886,18 +5891,16 @@ protoOf(Endpoint).equals = function (other) {
     return true;
   if (!(other instanceof Endpoint))
     return false;
-  var tmp = this.sp_1;
+  var tmp = this.tp_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.sp_1;
+  var tmp_1 = other.tp_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.tp_1, other.tp_1))
-    return false;
-  if (!this.up_1.equals(other.up_1))
+  if (!equals(this.up_1, other.up_1))
     return false;
   if (!this.vp_1.equals(other.vp_1))
     return false;
-  if (!equals(this.wp_1, other.wp_1))
+  if (!this.wp_1.equals(other.wp_1))
     return false;
   if (!equals(this.xp_1, other.xp_1))
     return false;
@@ -5907,20 +5910,22 @@ protoOf(Endpoint).equals = function (other) {
     return false;
   if (!equals(this.aq_1, other.aq_1))
     return false;
+  if (!equals(this.bq_1, other.bq_1))
+    return false;
   return true;
 };
 function Field(annotations, identifier, reference) {
-  this.pp_1 = annotations;
-  this.qp_1 = identifier;
-  this.rp_1 = reference;
+  this.qp_1 = annotations;
+  this.rp_1 = identifier;
+  this.sp_1 = reference;
 }
 protoOf(Field).toString = function () {
-  return 'Field(annotations=' + toString(this.pp_1) + ', identifier=' + this.qp_1.toString() + ', reference=' + toString(this.rp_1) + ')';
+  return 'Field(annotations=' + toString(this.qp_1) + ', identifier=' + this.rp_1.toString() + ', reference=' + toString(this.sp_1) + ')';
 };
 protoOf(Field).hashCode = function () {
-  var result = hashCode(this.pp_1);
-  result = imul(result, 31) + this.qp_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.rp_1) | 0;
+  var result = hashCode(this.qp_1);
+  result = imul(result, 31) + this.rp_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.sp_1) | 0;
   return result;
 };
 protoOf(Field).equals = function (other) {
@@ -5928,39 +5933,39 @@ protoOf(Field).equals = function (other) {
     return true;
   if (!(other instanceof Field))
     return false;
-  if (!equals(this.pp_1, other.pp_1))
+  if (!equals(this.qp_1, other.qp_1))
     return false;
-  if (!this.qp_1.equals(other.qp_1))
+  if (!this.rp_1.equals(other.rp_1))
     return false;
-  if (!equals(this.rp_1, other.rp_1))
+  if (!equals(this.sp_1, other.sp_1))
     return false;
   return true;
 };
 function Enum_0(comment, annotations, identifier, entries) {
-  this.vr_1 = comment;
-  this.wr_1 = annotations;
-  this.xr_1 = identifier;
-  this.yr_1 = entries;
+  this.wr_1 = comment;
+  this.xr_1 = annotations;
+  this.yr_1 = identifier;
+  this.zr_1 = entries;
 }
-protoOf(Enum_0).mr = function () {
-  return this.xr_1;
+protoOf(Enum_0).nr = function () {
+  return this.yr_1;
 };
 protoOf(Enum_0).toString = function () {
-  var tmp = this.vr_1;
-  return 'Enum(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.wr_1) + ', identifier=' + this.xr_1.toString() + ', entries=' + toString(this.yr_1) + ')';
+  var tmp = this.wr_1;
+  return 'Enum(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.xr_1) + ', identifier=' + this.yr_1.toString() + ', entries=' + toString(this.zr_1) + ')';
 };
 protoOf(Enum_0).hashCode = function () {
   var tmp;
-  var tmp_0 = this.vr_1;
+  var tmp_0 = this.wr_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.vr_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.wr_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.wr_1) | 0;
-  result = imul(result, 31) + this.xr_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.yr_1) | 0;
+  result = imul(result, 31) + hashCode(this.xr_1) | 0;
+  result = imul(result, 31) + this.yr_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.zr_1) | 0;
   return result;
 };
 protoOf(Enum_0).equals = function (other) {
@@ -5968,44 +5973,44 @@ protoOf(Enum_0).equals = function (other) {
     return true;
   if (!(other instanceof Enum_0))
     return false;
-  var tmp = this.vr_1;
+  var tmp = this.wr_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.vr_1;
+  var tmp_1 = other.wr_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.wr_1, other.wr_1))
+  if (!equals(this.xr_1, other.xr_1))
     return false;
-  if (!this.xr_1.equals(other.xr_1))
+  if (!this.yr_1.equals(other.yr_1))
     return false;
-  if (!equals(this.yr_1, other.yr_1))
+  if (!equals(this.zr_1, other.zr_1))
     return false;
   return true;
 };
 function Refined(comment, annotations, identifier, reference) {
-  this.qr_1 = comment;
-  this.rr_1 = annotations;
-  this.sr_1 = identifier;
-  this.tr_1 = reference;
+  this.rr_1 = comment;
+  this.sr_1 = annotations;
+  this.tr_1 = identifier;
+  this.ur_1 = reference;
 }
-protoOf(Refined).mr = function () {
-  return this.sr_1;
+protoOf(Refined).nr = function () {
+  return this.tr_1;
 };
 protoOf(Refined).toString = function () {
-  var tmp = this.qr_1;
-  return 'Refined(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.rr_1) + ', identifier=' + this.sr_1.toString() + ', reference=' + this.tr_1.toString() + ')';
+  var tmp = this.rr_1;
+  return 'Refined(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.sr_1) + ', identifier=' + this.tr_1.toString() + ', reference=' + this.ur_1.toString() + ')';
 };
 protoOf(Refined).hashCode = function () {
   var tmp;
-  var tmp_0 = this.qr_1;
+  var tmp_0 = this.rr_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.qr_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.rr_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.rr_1) | 0;
-  result = imul(result, 31) + this.sr_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.sr_1) | 0;
   result = imul(result, 31) + this.tr_1.hashCode() | 0;
+  result = imul(result, 31) + this.ur_1.hashCode() | 0;
   return result;
 };
 protoOf(Refined).equals = function (other) {
@@ -6013,44 +6018,44 @@ protoOf(Refined).equals = function (other) {
     return true;
   if (!(other instanceof Refined))
     return false;
-  var tmp = this.qr_1;
+  var tmp = this.rr_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.qr_1;
+  var tmp_1 = other.rr_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.rr_1, other.rr_1))
-    return false;
-  if (!this.sr_1.equals(other.sr_1))
+  if (!equals(this.sr_1, other.sr_1))
     return false;
   if (!this.tr_1.equals(other.tr_1))
     return false;
+  if (!this.ur_1.equals(other.ur_1))
+    return false;
   return true;
 };
 function Union(comment, annotations, identifier, entries) {
-  this.ep_1 = comment;
-  this.fp_1 = annotations;
-  this.gp_1 = identifier;
-  this.hp_1 = entries;
+  this.fp_1 = comment;
+  this.gp_1 = annotations;
+  this.hp_1 = identifier;
+  this.ip_1 = entries;
 }
-protoOf(Union).mr = function () {
-  return this.gp_1;
+protoOf(Union).nr = function () {
+  return this.hp_1;
 };
 protoOf(Union).toString = function () {
-  var tmp = this.ep_1;
-  return 'Union(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.fp_1) + ', identifier=' + this.gp_1.toString() + ', entries=' + toString(this.hp_1) + ')';
+  var tmp = this.fp_1;
+  return 'Union(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.gp_1) + ', identifier=' + this.hp_1.toString() + ', entries=' + toString(this.ip_1) + ')';
 };
 protoOf(Union).hashCode = function () {
   var tmp;
-  var tmp_0 = this.ep_1;
+  var tmp_0 = this.fp_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.ep_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.fp_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.fp_1) | 0;
-  result = imul(result, 31) + this.gp_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.hp_1) | 0;
+  result = imul(result, 31) + hashCode(this.gp_1) | 0;
+  result = imul(result, 31) + this.hp_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.ip_1) | 0;
   return result;
 };
 protoOf(Union).equals = function (other) {
@@ -6058,44 +6063,44 @@ protoOf(Union).equals = function (other) {
     return true;
   if (!(other instanceof Union))
     return false;
-  var tmp = this.ep_1;
+  var tmp = this.fp_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.ep_1;
+  var tmp_1 = other.fp_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.fp_1, other.fp_1))
+  if (!equals(this.gp_1, other.gp_1))
     return false;
-  if (!this.gp_1.equals(other.gp_1))
+  if (!this.hp_1.equals(other.hp_1))
     return false;
-  if (!equals(this.hp_1, other.hp_1))
+  if (!equals(this.ip_1, other.ip_1))
     return false;
   return true;
 };
 function Channel(comment, annotations, identifier, reference) {
-  this.ap_1 = comment;
-  this.bp_1 = annotations;
-  this.cp_1 = identifier;
-  this.dp_1 = reference;
+  this.bp_1 = comment;
+  this.cp_1 = annotations;
+  this.dp_1 = identifier;
+  this.ep_1 = reference;
 }
-protoOf(Channel).mr = function () {
-  return this.cp_1;
+protoOf(Channel).nr = function () {
+  return this.dp_1;
 };
 protoOf(Channel).toString = function () {
-  var tmp = this.ap_1;
-  return 'Channel(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.bp_1) + ', identifier=' + this.cp_1.toString() + ', reference=' + toString(this.dp_1) + ')';
+  var tmp = this.bp_1;
+  return 'Channel(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', annotations=' + toString(this.cp_1) + ', identifier=' + this.dp_1.toString() + ', reference=' + toString(this.ep_1) + ')';
 };
 protoOf(Channel).hashCode = function () {
   var tmp;
-  var tmp_0 = this.ap_1;
+  var tmp_0 = this.bp_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.ap_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.bp_1);
   }
   var result = tmp;
-  result = imul(result, 31) + hashCode(this.bp_1) | 0;
-  result = imul(result, 31) + this.cp_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.dp_1) | 0;
+  result = imul(result, 31) + hashCode(this.cp_1) | 0;
+  result = imul(result, 31) + this.dp_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.ep_1) | 0;
   return result;
 };
 protoOf(Channel).equals = function (other) {
@@ -6103,16 +6108,16 @@ protoOf(Channel).equals = function (other) {
     return true;
   if (!(other instanceof Channel))
     return false;
-  var tmp = this.ap_1;
+  var tmp = this.bp_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = other.ap_1;
+  var tmp_1 = other.bp_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!equals(this.bp_1, other.bp_1))
+  if (!equals(this.cp_1, other.cp_1))
     return false;
-  if (!this.cp_1.equals(other.cp_1))
+  if (!this.dp_1.equals(other.dp_1))
     return false;
-  if (!equals(this.dp_1, other.dp_1))
+  if (!equals(this.ep_1, other.ep_1))
     return false;
   return true;
 };
@@ -6120,47 +6125,47 @@ function Model() {
 }
 function DefinitionIdentifier(name) {
   Identifier.call(this, name);
-  this.vt_1 = name;
+  this.wt_1 = name;
 }
 protoOf(DefinitionIdentifier).toString = function () {
-  return 'DefinitionIdentifier(name=' + this.vt_1 + ')';
+  return 'DefinitionIdentifier(name=' + this.wt_1 + ')';
 };
 protoOf(DefinitionIdentifier).hashCode = function () {
-  return getStringHashCode(this.vt_1);
+  return getStringHashCode(this.wt_1);
 };
 protoOf(DefinitionIdentifier).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof DefinitionIdentifier))
     return false;
-  if (!(this.vt_1 === other.vt_1))
+  if (!(this.wt_1 === other.wt_1))
     return false;
   return true;
 };
 function FieldIdentifier(name) {
   Identifier.call(this, name);
-  this.xt_1 = name;
+  this.yt_1 = name;
 }
 protoOf(FieldIdentifier).toString = function () {
-  return 'FieldIdentifier(name=' + this.xt_1 + ')';
+  return 'FieldIdentifier(name=' + this.yt_1 + ')';
 };
 protoOf(FieldIdentifier).hashCode = function () {
-  return getStringHashCode(this.xt_1);
+  return getStringHashCode(this.yt_1);
 };
 protoOf(FieldIdentifier).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof FieldIdentifier))
     return false;
-  if (!(this.xt_1 === other.xt_1))
+  if (!(this.yt_1 === other.yt_1))
     return false;
   return true;
 };
 function Identifier(name) {
-  this.op_1 = removeBackticks(name);
+  this.pp_1 = removeBackticks(name);
 }
 protoOf(Identifier).l1 = function () {
-  return this.op_1;
+  return this.pp_1;
 };
 protoOf(Identifier).toString = function () {
   return this.l1();
@@ -6173,7 +6178,7 @@ function _Comment___get_value__impl__8r3pla($this) {
 }
 function Companion_3() {
 }
-protoOf(Companion_3).jt = function (comment) {
+protoOf(Companion_3).kt = function (comment) {
   return _Comment___init__impl__cg8s2u(removeCommentMarkers(comment));
 };
 var Companion_instance_4;
@@ -6189,89 +6194,89 @@ function Comment__hashCode_impl_tr9dgt($this) {
 function Comment__equals_impl_3xkmkx($this, other) {
   if (!(other instanceof Comment))
     return false;
-  if (!($this === other.kt_1))
+  if (!($this === other.lt_1))
     return false;
   return true;
 }
 function Comment(value) {
-  this.kt_1 = value;
+  this.lt_1 = value;
 }
 protoOf(Comment).l1 = function () {
-  return _Comment___get_value__impl__8r3pla(this.kt_1);
+  return _Comment___get_value__impl__8r3pla(this.lt_1);
 };
 protoOf(Comment).toString = function () {
-  return Comment__toString_impl_803gny(this.kt_1);
+  return Comment__toString_impl_803gny(this.lt_1);
 };
 protoOf(Comment).hashCode = function () {
-  return Comment__hashCode_impl_tr9dgt(this.kt_1);
+  return Comment__hashCode_impl_tr9dgt(this.lt_1);
 };
 protoOf(Comment).equals = function (other) {
-  return Comment__equals_impl_3xkmkx(this.kt_1, other);
+  return Comment__equals_impl_3xkmkx(this.lt_1, other);
 };
 function Single(value) {
-  this.yt_1 = value;
+  this.zt_1 = value;
 }
 protoOf(Single).toString = function () {
-  return 'Single(value=' + this.yt_1 + ')';
+  return 'Single(value=' + this.zt_1 + ')';
 };
 protoOf(Single).hashCode = function () {
-  return getStringHashCode(this.yt_1);
+  return getStringHashCode(this.zt_1);
 };
 protoOf(Single).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Single))
     return false;
-  if (!(this.yt_1 === other.yt_1))
+  if (!(this.zt_1 === other.zt_1))
     return false;
   return true;
 };
 function Array_0(value) {
-  this.zt_1 = value;
+  this.au_1 = value;
 }
 protoOf(Array_0).toString = function () {
-  return 'Array(value=' + toString(this.zt_1) + ')';
+  return 'Array(value=' + toString(this.au_1) + ')';
 };
 protoOf(Array_0).hashCode = function () {
-  return hashCode(this.zt_1);
+  return hashCode(this.au_1);
 };
 protoOf(Array_0).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Array_0))
     return false;
-  if (!equals(this.zt_1, other.zt_1))
+  if (!equals(this.au_1, other.au_1))
     return false;
   return true;
 };
 function Dict(value) {
-  this.au_1 = value;
+  this.bu_1 = value;
 }
 protoOf(Dict).toString = function () {
-  return 'Dict(value=' + toString(this.au_1) + ')';
+  return 'Dict(value=' + toString(this.bu_1) + ')';
 };
 protoOf(Dict).hashCode = function () {
-  return hashCode(this.au_1);
+  return hashCode(this.bu_1);
 };
 protoOf(Dict).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Dict))
     return false;
-  if (!equals(this.au_1, other.au_1))
+  if (!equals(this.bu_1, other.bu_1))
     return false;
   return true;
 };
 function Parameter(name, value) {
-  this.bu_1 = name;
-  this.cu_1 = value;
+  this.cu_1 = name;
+  this.du_1 = value;
 }
 protoOf(Parameter).toString = function () {
-  return 'Parameter(name=' + this.bu_1 + ', value=' + toString(this.cu_1) + ')';
+  return 'Parameter(name=' + this.cu_1 + ', value=' + toString(this.du_1) + ')';
 };
 protoOf(Parameter).hashCode = function () {
-  var result = getStringHashCode(this.bu_1);
-  result = imul(result, 31) + hashCode(this.cu_1) | 0;
+  var result = getStringHashCode(this.cu_1);
+  result = imul(result, 31) + hashCode(this.du_1) | 0;
   return result;
 };
 protoOf(Parameter).equals = function (other) {
@@ -6279,22 +6284,22 @@ protoOf(Parameter).equals = function (other) {
     return true;
   if (!(other instanceof Parameter))
     return false;
-  if (!(this.bu_1 === other.bu_1))
+  if (!(this.cu_1 === other.cu_1))
     return false;
-  if (!equals(this.cu_1, other.cu_1))
+  if (!equals(this.du_1, other.du_1))
     return false;
   return true;
 };
 function Annotation(name, parameters) {
-  this.du_1 = name;
-  this.eu_1 = parameters;
+  this.eu_1 = name;
+  this.fu_1 = parameters;
 }
 protoOf(Annotation).toString = function () {
-  return 'Annotation(name=' + this.du_1 + ', parameters=' + toString(this.eu_1) + ')';
+  return 'Annotation(name=' + this.eu_1 + ', parameters=' + toString(this.fu_1) + ')';
 };
 protoOf(Annotation).hashCode = function () {
-  var result = getStringHashCode(this.du_1);
-  result = imul(result, 31) + hashCode(this.eu_1) | 0;
+  var result = getStringHashCode(this.eu_1);
+  result = imul(result, 31) + hashCode(this.fu_1) | 0;
   return result;
 };
 protoOf(Annotation).equals = function (other) {
@@ -6302,9 +6307,9 @@ protoOf(Annotation).equals = function (other) {
     return true;
   if (!(other instanceof Annotation))
     return false;
-  if (!(this.du_1 === other.du_1))
+  if (!(this.eu_1 === other.eu_1))
     return false;
-  if (!equals(this.eu_1, other.eu_1))
+  if (!equals(this.fu_1, other.fu_1))
     return false;
   return true;
 };
@@ -6333,35 +6338,35 @@ function RegExp__hashCode_impl_40vfcn($this) {
 function RegExp__equals_impl_fyc0d7($this, other) {
   if (!(other instanceof RegExp_0))
     return false;
-  if (!($this === other.pt_1))
+  if (!($this === other.qt_1))
     return false;
   return true;
 }
 function RegExp_0(value) {
-  this.pt_1 = value;
+  this.qt_1 = value;
 }
 protoOf(RegExp_0).l1 = function () {
-  return _RegExp___get_value__impl__7o7618(this.pt_1);
+  return _RegExp___get_value__impl__7o7618(this.qt_1);
 };
 protoOf(RegExp_0).toString = function () {
-  return RegExp__toString_impl_hqahg8(this.pt_1);
+  return RegExp__toString_impl_hqahg8(this.qt_1);
 };
 protoOf(RegExp_0).hashCode = function () {
-  return RegExp__hashCode_impl_40vfcn(this.pt_1);
+  return RegExp__hashCode_impl_40vfcn(this.qt_1);
 };
 protoOf(RegExp_0).equals = function (other) {
-  return RegExp__equals_impl_fyc0d7(this.pt_1, other);
+  return RegExp__equals_impl_fyc0d7(this.qt_1, other);
 };
 function Bound(min, max) {
-  this.fu_1 = min;
-  this.gu_1 = max;
+  this.gu_1 = min;
+  this.hu_1 = max;
 }
 protoOf(Bound).toString = function () {
-  return 'Bound(min=' + this.fu_1 + ', max=' + this.gu_1 + ')';
+  return 'Bound(min=' + this.gu_1 + ', max=' + this.hu_1 + ')';
 };
 protoOf(Bound).hashCode = function () {
-  var result = this.fu_1 == null ? 0 : getStringHashCode(this.fu_1);
-  result = imul(result, 31) + (this.gu_1 == null ? 0 : getStringHashCode(this.gu_1)) | 0;
+  var result = this.gu_1 == null ? 0 : getStringHashCode(this.gu_1);
+  result = imul(result, 31) + (this.hu_1 == null ? 0 : getStringHashCode(this.hu_1)) | 0;
   return result;
 };
 protoOf(Bound).equals = function (other) {
@@ -6369,33 +6374,33 @@ protoOf(Bound).equals = function (other) {
     return true;
   if (!(other instanceof Bound))
     return false;
-  if (!(this.fu_1 == other.fu_1))
-    return false;
   if (!(this.gu_1 == other.gu_1))
     return false;
+  if (!(this.hu_1 == other.hu_1))
+    return false;
   return true;
 };
 function Precision(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function String_0(constraint) {
-  this.hu_1 = constraint;
-  this.iu_1 = 'String';
+  this.iu_1 = constraint;
+  this.ju_1 = 'String';
 }
 protoOf(String_0).m = function () {
-  return this.iu_1;
+  return this.ju_1;
 };
 protoOf(String_0).toString = function () {
-  var tmp = this.hu_1;
+  var tmp = this.iu_1;
   return 'String(constraint=' + toString_1(tmp == null ? null : new RegExp_0(tmp)) + ')';
 };
 protoOf(String_0).hashCode = function () {
   var tmp;
-  var tmp_0 = this.hu_1;
+  var tmp_0 = this.iu_1;
   if ((tmp_0 == null ? null : new RegExp_0(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = RegExp__hashCode_impl_40vfcn(this.hu_1);
+    tmp = RegExp__hashCode_impl_40vfcn(this.iu_1);
   }
   return tmp;
 };
@@ -6404,28 +6409,28 @@ protoOf(String_0).equals = function (other) {
     return true;
   if (!(other instanceof String_0))
     return false;
-  var tmp = this.hu_1;
+  var tmp = this.iu_1;
   var tmp_0 = tmp == null ? null : new RegExp_0(tmp);
-  var tmp_1 = other.hu_1;
+  var tmp_1 = other.iu_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new RegExp_0(tmp_1)))
     return false;
   return true;
 };
 function Integer(precision, constraint) {
   precision = precision === VOID ? Precision_P64_getInstance() : precision;
-  this.ju_1 = precision;
-  this.ku_1 = constraint;
-  this.lu_1 = 'Integer';
+  this.ku_1 = precision;
+  this.lu_1 = constraint;
+  this.mu_1 = 'Integer';
 }
 protoOf(Integer).m = function () {
-  return this.lu_1;
+  return this.mu_1;
 };
 protoOf(Integer).toString = function () {
-  return 'Integer(precision=' + this.ju_1.toString() + ', constraint=' + toString_1(this.ku_1) + ')';
+  return 'Integer(precision=' + this.ku_1.toString() + ', constraint=' + toString_1(this.lu_1) + ')';
 };
 protoOf(Integer).hashCode = function () {
-  var result = this.ju_1.hashCode();
-  result = imul(result, 31) + (this.ku_1 == null ? 0 : this.ku_1.hashCode()) | 0;
+  var result = this.ku_1.hashCode();
+  result = imul(result, 31) + (this.lu_1 == null ? 0 : this.lu_1.hashCode()) | 0;
   return result;
 };
 protoOf(Integer).equals = function (other) {
@@ -6433,27 +6438,27 @@ protoOf(Integer).equals = function (other) {
     return true;
   if (!(other instanceof Integer))
     return false;
-  if (!this.ju_1.equals(other.ju_1))
+  if (!this.ku_1.equals(other.ku_1))
     return false;
-  if (!equals(this.ku_1, other.ku_1))
+  if (!equals(this.lu_1, other.lu_1))
     return false;
   return true;
 };
 function Number_0(precision, constraint) {
   precision = precision === VOID ? Precision_P64_getInstance() : precision;
-  this.mu_1 = precision;
-  this.nu_1 = constraint;
-  this.ou_1 = 'Number';
+  this.nu_1 = precision;
+  this.ou_1 = constraint;
+  this.pu_1 = 'Number';
 }
 protoOf(Number_0).m = function () {
-  return this.ou_1;
+  return this.pu_1;
 };
 protoOf(Number_0).toString = function () {
-  return 'Number(precision=' + this.mu_1.toString() + ', constraint=' + toString_1(this.nu_1) + ')';
+  return 'Number(precision=' + this.nu_1.toString() + ', constraint=' + toString_1(this.ou_1) + ')';
 };
 protoOf(Number_0).hashCode = function () {
-  var result = this.mu_1.hashCode();
-  result = imul(result, 31) + (this.nu_1 == null ? 0 : this.nu_1.hashCode()) | 0;
+  var result = this.nu_1.hashCode();
+  result = imul(result, 31) + (this.ou_1 == null ? 0 : this.ou_1.hashCode()) | 0;
   return result;
 };
 protoOf(Number_0).equals = function (other) {
@@ -6461,17 +6466,17 @@ protoOf(Number_0).equals = function (other) {
     return true;
   if (!(other instanceof Number_0))
     return false;
-  if (!this.mu_1.equals(other.mu_1))
+  if (!this.nu_1.equals(other.nu_1))
     return false;
-  if (!equals(this.nu_1, other.nu_1))
+  if (!equals(this.ou_1, other.ou_1))
     return false;
   return true;
 };
 function Boolean_0() {
-  this.pu_1 = 'Boolean';
+  this.qu_1 = 'Boolean';
 }
 protoOf(Boolean_0).m = function () {
-  return this.pu_1;
+  return this.qu_1;
 };
 protoOf(Boolean_0).toString = function () {
   return 'Boolean';
@@ -6491,10 +6496,10 @@ function Boolean_getInstance() {
   return Boolean_instance;
 }
 function Bytes() {
-  this.qu_1 = 'Bytes';
+  this.ru_1 = 'Bytes';
 }
 protoOf(Bytes).m = function () {
-  return this.qu_1;
+  return this.ru_1;
 };
 protoOf(Bytes).toString = function () {
   return 'Bytes';
@@ -6522,58 +6527,58 @@ function Precision_P64_getInstance() {
   return Precision_P64_instance;
 }
 function Any(isNullable) {
-  this.ru_1 = isNullable;
-  this.su_1 = 'Any';
+  this.su_1 = isNullable;
+  this.tu_1 = 'Any';
 }
-protoOf(Any).tu = function () {
-  return this.ru_1;
+protoOf(Any).uu = function () {
+  return this.su_1;
 };
 protoOf(Any).l1 = function () {
-  return this.su_1;
+  return this.tu_1;
 };
-protoOf(Any).uu = function (isNullable) {
+protoOf(Any).vu = function (isNullable) {
   return new Any(isNullable);
 };
 protoOf(Any).toString = function () {
-  return 'Any(isNullable=' + this.ru_1 + ')';
+  return 'Any(isNullable=' + this.su_1 + ')';
 };
 protoOf(Any).hashCode = function () {
-  return getBooleanHashCode(this.ru_1);
+  return getBooleanHashCode(this.su_1);
 };
 protoOf(Any).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Any))
     return false;
-  if (!(this.ru_1 === other.ru_1))
+  if (!(this.su_1 === other.su_1))
     return false;
   return true;
 };
 function Unit(isNullable) {
-  this.wu_1 = isNullable;
-  this.xu_1 = 'Unit';
+  this.xu_1 = isNullable;
+  this.yu_1 = 'Unit';
 }
-protoOf(Unit).tu = function () {
-  return this.wu_1;
+protoOf(Unit).uu = function () {
+  return this.xu_1;
 };
 protoOf(Unit).l1 = function () {
-  return this.xu_1;
+  return this.yu_1;
 };
-protoOf(Unit).uu = function (isNullable) {
+protoOf(Unit).vu = function (isNullable) {
   return new Unit(isNullable);
 };
 protoOf(Unit).toString = function () {
-  return 'Unit(isNullable=' + this.wu_1 + ')';
+  return 'Unit(isNullable=' + this.xu_1 + ')';
 };
 protoOf(Unit).hashCode = function () {
-  return getBooleanHashCode(this.wu_1);
+  return getBooleanHashCode(this.xu_1);
 };
 protoOf(Unit).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Unit))
     return false;
-  if (!(this.wu_1 === other.wu_1))
+  if (!(this.xu_1 === other.xu_1))
     return false;
   return true;
 };
@@ -6582,19 +6587,19 @@ function Dict_0(reference, isNullable) {
   this.to_1 = isNullable;
   this.uo_1 = 'Dict';
 }
-protoOf(Dict_0).tu = function () {
+protoOf(Dict_0).uu = function () {
   return this.to_1;
 };
 protoOf(Dict_0).l1 = function () {
   return this.uo_1;
 };
-protoOf(Dict_0).yu = function (reference, isNullable) {
+protoOf(Dict_0).zu = function (reference, isNullable) {
   return new Dict_0(reference, isNullable);
 };
-protoOf(Dict_0).zu = function (reference, isNullable, $super) {
+protoOf(Dict_0).av = function (reference, isNullable, $super) {
   reference = reference === VOID ? this.so_1 : reference;
   isNullable = isNullable === VOID ? this.to_1 : isNullable;
-  return $super === VOID ? this.yu(reference, isNullable) : $super.yu.call(this, reference, isNullable);
+  return $super === VOID ? this.zu(reference, isNullable) : $super.zu.call(this, reference, isNullable);
 };
 protoOf(Dict_0).toString = function () {
   return 'Dict(reference=' + toString(this.so_1) + ', isNullable=' + this.to_1 + ')';
@@ -6620,19 +6625,19 @@ function Iterable(reference, isNullable) {
   this.qo_1 = isNullable;
   this.ro_1 = 'Iterable';
 }
-protoOf(Iterable).tu = function () {
+protoOf(Iterable).uu = function () {
   return this.qo_1;
 };
 protoOf(Iterable).l1 = function () {
   return this.ro_1;
 };
-protoOf(Iterable).yu = function (reference, isNullable) {
+protoOf(Iterable).zu = function (reference, isNullable) {
   return new Iterable(reference, isNullable);
 };
-protoOf(Iterable).av = function (reference, isNullable, $super) {
+protoOf(Iterable).bv = function (reference, isNullable, $super) {
   reference = reference === VOID ? this.po_1 : reference;
   isNullable = isNullable === VOID ? this.qo_1 : isNullable;
-  return $super === VOID ? this.yu(reference, isNullable) : $super.yu.call(this, reference, isNullable);
+  return $super === VOID ? this.zu(reference, isNullable) : $super.zu.call(this, reference, isNullable);
 };
 protoOf(Iterable).toString = function () {
   return 'Iterable(reference=' + toString(this.po_1) + ', isNullable=' + this.qo_1 + ')';
@@ -6654,29 +6659,29 @@ protoOf(Iterable).equals = function (other) {
   return true;
 };
 function Custom(value, isNullable) {
-  this.bv_1 = value;
-  this.cv_1 = isNullable;
+  this.cv_1 = value;
+  this.dv_1 = isNullable;
 }
 protoOf(Custom).l1 = function () {
-  return this.bv_1;
-};
-protoOf(Custom).tu = function () {
   return this.cv_1;
 };
-protoOf(Custom).dv = function (value, isNullable) {
+protoOf(Custom).uu = function () {
+  return this.dv_1;
+};
+protoOf(Custom).ev = function (value, isNullable) {
   return new Custom(value, isNullable);
 };
-protoOf(Custom).ev = function (value, isNullable, $super) {
-  value = value === VOID ? this.bv_1 : value;
-  isNullable = isNullable === VOID ? this.cv_1 : isNullable;
-  return $super === VOID ? this.dv(value, isNullable) : $super.dv.call(this, value, isNullable);
+protoOf(Custom).fv = function (value, isNullable, $super) {
+  value = value === VOID ? this.cv_1 : value;
+  isNullable = isNullable === VOID ? this.dv_1 : isNullable;
+  return $super === VOID ? this.ev(value, isNullable) : $super.ev.call(this, value, isNullable);
 };
 protoOf(Custom).toString = function () {
-  return 'Custom(value=' + this.bv_1 + ', isNullable=' + this.cv_1 + ')';
+  return 'Custom(value=' + this.cv_1 + ', isNullable=' + this.dv_1 + ')';
 };
 protoOf(Custom).hashCode = function () {
-  var result = getStringHashCode(this.bv_1);
-  result = imul(result, 31) + getBooleanHashCode(this.cv_1) | 0;
+  var result = getStringHashCode(this.cv_1);
+  result = imul(result, 31) + getBooleanHashCode(this.dv_1) | 0;
   return result;
 };
 protoOf(Custom).equals = function (other) {
@@ -6684,37 +6689,37 @@ protoOf(Custom).equals = function (other) {
     return true;
   if (!(other instanceof Custom))
     return false;
-  if (!(this.bv_1 === other.bv_1))
-    return false;
   if (!(this.cv_1 === other.cv_1))
     return false;
+  if (!(this.dv_1 === other.dv_1))
+    return false;
   return true;
 };
 function Primitive(type, isNullable) {
-  this.fv_1 = type;
-  this.gv_1 = isNullable;
-  this.hv_1 = this.fv_1.m();
+  this.gv_1 = type;
+  this.hv_1 = isNullable;
+  this.iv_1 = this.gv_1.m();
 }
-protoOf(Primitive).tu = function () {
-  return this.gv_1;
+protoOf(Primitive).uu = function () {
+  return this.hv_1;
 };
 protoOf(Primitive).l1 = function () {
-  return this.hv_1;
+  return this.iv_1;
 };
-protoOf(Primitive).iv = function (type, isNullable) {
+protoOf(Primitive).jv = function (type, isNullable) {
   return new Primitive(type, isNullable);
 };
-protoOf(Primitive).jv = function (type, isNullable, $super) {
-  type = type === VOID ? this.fv_1 : type;
-  isNullable = isNullable === VOID ? this.gv_1 : isNullable;
-  return $super === VOID ? this.iv(type, isNullable) : $super.iv.call(this, type, isNullable);
+protoOf(Primitive).kv = function (type, isNullable, $super) {
+  type = type === VOID ? this.gv_1 : type;
+  isNullable = isNullable === VOID ? this.hv_1 : isNullable;
+  return $super === VOID ? this.jv(type, isNullable) : $super.jv.call(this, type, isNullable);
 };
 protoOf(Primitive).toString = function () {
-  return 'Primitive(type=' + toString(this.fv_1) + ', isNullable=' + this.gv_1 + ')';
+  return 'Primitive(type=' + toString(this.gv_1) + ', isNullable=' + this.hv_1 + ')';
 };
 protoOf(Primitive).hashCode = function () {
-  var result = hashCode(this.fv_1);
-  result = imul(result, 31) + getBooleanHashCode(this.gv_1) | 0;
+  var result = hashCode(this.gv_1);
+  result = imul(result, 31) + getBooleanHashCode(this.hv_1) | 0;
   return result;
 };
 protoOf(Primitive).equals = function (other) {
@@ -6722,38 +6727,38 @@ protoOf(Primitive).equals = function (other) {
     return true;
   if (!(other instanceof Primitive))
     return false;
-  if (!equals(this.fv_1, other.fv_1))
+  if (!equals(this.gv_1, other.gv_1))
     return false;
-  if (!(this.gv_1 === other.gv_1))
+  if (!(this.hv_1 === other.hv_1))
     return false;
   return true;
 };
 function Reference() {
 }
 function Module(fileUri, statements) {
-  this.sq_1 = fileUri;
-  this.tq_1 = statements;
+  this.tq_1 = fileUri;
+  this.uq_1 = statements;
 }
 protoOf(Module).ve = function () {
-  return this.sq_1;
-};
-protoOf(Module).kv = function () {
   return this.tq_1;
 };
-protoOf(Module).lv = function (fileUri, statements) {
+protoOf(Module).lv = function () {
+  return this.uq_1;
+};
+protoOf(Module).mv = function (fileUri, statements) {
   return new Module(fileUri, statements);
 };
-protoOf(Module).mv = function (fileUri, statements, $super) {
-  fileUri = fileUri === VOID ? this.sq_1 : fileUri;
-  statements = statements === VOID ? this.tq_1 : statements;
-  return $super === VOID ? this.lv(fileUri, statements) : $super.lv.call(this, fileUri, new NonEmptyList(statements));
+protoOf(Module).nv = function (fileUri, statements, $super) {
+  fileUri = fileUri === VOID ? this.tq_1 : fileUri;
+  statements = statements === VOID ? this.uq_1 : statements;
+  return $super === VOID ? this.mv(fileUri, statements) : $super.mv.call(this, fileUri, new NonEmptyList(statements));
 };
 protoOf(Module).toString = function () {
-  return 'Module(fileUri=' + this.sq_1.toString() + ', statements=' + NonEmptyList__toString_impl_ozxm8z(this.tq_1) + ')';
+  return 'Module(fileUri=' + this.tq_1.toString() + ', statements=' + NonEmptyList__toString_impl_ozxm8z(this.uq_1) + ')';
 };
 protoOf(Module).hashCode = function () {
-  var result = this.sq_1.hashCode();
-  result = imul(result, 31) + NonEmptyList__hashCode_impl_38rpg4(this.tq_1) | 0;
+  var result = this.tq_1.hashCode();
+  result = imul(result, 31) + NonEmptyList__hashCode_impl_38rpg4(this.uq_1) | 0;
   return result;
 };
 protoOf(Module).equals = function (other) {
@@ -6761,42 +6766,42 @@ protoOf(Module).equals = function (other) {
     return true;
   if (!(other instanceof Module))
     return false;
-  if (!this.sq_1.equals(other.sq_1))
+  if (!this.tq_1.equals(other.tq_1))
     return false;
-  if (!equals(new NonEmptyList(this.tq_1), new NonEmptyList(other.tq_1)))
+  if (!equals(new NonEmptyList(this.uq_1), new NonEmptyList(other.uq_1)))
     return false;
   return true;
 };
 function Root(modules) {
-  this.rq_1 = modules;
+  this.sq_1 = modules;
 }
 protoOf(Root).toString = function () {
-  return 'Root(modules=' + NonEmptyList__toString_impl_ozxm8z(this.rq_1) + ')';
+  return 'Root(modules=' + NonEmptyList__toString_impl_ozxm8z(this.sq_1) + ')';
 };
 protoOf(Root).hashCode = function () {
-  return NonEmptyList__hashCode_impl_38rpg4(this.rq_1);
+  return NonEmptyList__hashCode_impl_38rpg4(this.sq_1);
 };
 protoOf(Root).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof Root))
     return false;
-  if (!equals(new NonEmptyList(this.rq_1), new NonEmptyList(other.rq_1)))
+  if (!equals(new NonEmptyList(this.sq_1), new NonEmptyList(other.sq_1)))
     return false;
   return true;
 };
 function IdxAndLength(idx, length) {
   idx = idx === VOID ? 0 : idx;
   length = length === VOID ? 0 : length;
-  this.nv_1 = idx;
-  this.ov_1 = length;
+  this.ov_1 = idx;
+  this.pv_1 = length;
 }
 protoOf(IdxAndLength).toString = function () {
-  return 'IdxAndLength(idx=' + this.nv_1 + ', length=' + this.ov_1 + ')';
+  return 'IdxAndLength(idx=' + this.ov_1 + ', length=' + this.pv_1 + ')';
 };
 protoOf(IdxAndLength).hashCode = function () {
-  var result = this.nv_1;
-  result = imul(result, 31) + this.ov_1 | 0;
+  var result = this.ov_1;
+  result = imul(result, 31) + this.pv_1 | 0;
   return result;
 };
 protoOf(IdxAndLength).equals = function (other) {
@@ -6804,36 +6809,36 @@ protoOf(IdxAndLength).equals = function (other) {
     return true;
   if (!(other instanceof IdxAndLength))
     return false;
-  if (!(this.nv_1 === other.nv_1))
-    return false;
   if (!(this.ov_1 === other.ov_1))
     return false;
+  if (!(this.pv_1 === other.pv_1))
+    return false;
   return true;
 };
 function Coordinates(line, position, idxAndLength) {
   line = line === VOID ? 1 : line;
   position = position === VOID ? 1 : position;
   idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-  this.ls_1 = line;
-  this.ms_1 = position;
-  this.ns_1 = idxAndLength;
+  this.ms_1 = line;
+  this.ns_1 = position;
+  this.os_1 = idxAndLength;
 }
-protoOf(Coordinates).pv = function (line, position, idxAndLength) {
+protoOf(Coordinates).qv = function (line, position, idxAndLength) {
   return new Coordinates(line, position, idxAndLength);
 };
-protoOf(Coordinates).qv = function (line, position, idxAndLength, $super) {
-  line = line === VOID ? this.ls_1 : line;
-  position = position === VOID ? this.ms_1 : position;
-  idxAndLength = idxAndLength === VOID ? this.ns_1 : idxAndLength;
-  return $super === VOID ? this.pv(line, position, idxAndLength) : $super.pv.call(this, line, position, idxAndLength);
+protoOf(Coordinates).rv = function (line, position, idxAndLength, $super) {
+  line = line === VOID ? this.ms_1 : line;
+  position = position === VOID ? this.ns_1 : position;
+  idxAndLength = idxAndLength === VOID ? this.os_1 : idxAndLength;
+  return $super === VOID ? this.qv(line, position, idxAndLength) : $super.qv.call(this, line, position, idxAndLength);
 };
 protoOf(Coordinates).toString = function () {
-  return 'Coordinates(line=' + this.ls_1 + ', position=' + this.ms_1 + ', idxAndLength=' + this.ns_1.toString() + ')';
+  return 'Coordinates(line=' + this.ms_1 + ', position=' + this.ns_1 + ', idxAndLength=' + this.os_1.toString() + ')';
 };
 protoOf(Coordinates).hashCode = function () {
-  var result = this.ls_1;
-  result = imul(result, 31) + this.ms_1 | 0;
-  result = imul(result, 31) + this.ns_1.hashCode() | 0;
+  var result = this.ms_1;
+  result = imul(result, 31) + this.ns_1 | 0;
+  result = imul(result, 31) + this.os_1.hashCode() | 0;
   return result;
 };
 protoOf(Coordinates).equals = function (other) {
@@ -6841,38 +6846,38 @@ protoOf(Coordinates).equals = function (other) {
     return true;
   if (!(other instanceof Coordinates))
     return false;
-  if (!(this.ls_1 === other.ls_1))
-    return false;
   if (!(this.ms_1 === other.ms_1))
     return false;
-  if (!this.ns_1.equals(other.ns_1))
+  if (!(this.ns_1 === other.ns_1))
+    return false;
+  if (!this.os_1.equals(other.os_1))
     return false;
   return true;
 };
 function Token(value, type, coordinates) {
-  this.is_1 = value;
-  this.js_1 = type;
-  this.ks_1 = coordinates;
+  this.js_1 = value;
+  this.ks_1 = type;
+  this.ls_1 = coordinates;
 }
 protoOf(Token).l1 = function () {
-  return this.is_1;
+  return this.js_1;
 };
-protoOf(Token).rv = function (value, type, coordinates) {
+protoOf(Token).sv = function (value, type, coordinates) {
   return new Token(value, type, coordinates);
 };
-protoOf(Token).sv = function (value, type, coordinates, $super) {
-  value = value === VOID ? this.is_1 : value;
-  type = type === VOID ? this.js_1 : type;
-  coordinates = coordinates === VOID ? this.ks_1 : coordinates;
-  return $super === VOID ? this.rv(value, type, coordinates) : $super.rv.call(this, value, type, coordinates);
+protoOf(Token).tv = function (value, type, coordinates, $super) {
+  value = value === VOID ? this.js_1 : value;
+  type = type === VOID ? this.ks_1 : type;
+  coordinates = coordinates === VOID ? this.ls_1 : coordinates;
+  return $super === VOID ? this.sv(value, type, coordinates) : $super.sv.call(this, value, type, coordinates);
 };
 protoOf(Token).toString = function () {
-  return 'Token(value=' + this.is_1 + ', type=' + toString(this.js_1) + ', coordinates=' + this.ks_1.toString() + ')';
+  return 'Token(value=' + this.js_1 + ', type=' + toString(this.ks_1) + ', coordinates=' + this.ls_1.toString() + ')';
 };
 protoOf(Token).hashCode = function () {
-  var result = getStringHashCode(this.is_1);
-  result = imul(result, 31) + hashCode(this.js_1) | 0;
-  result = imul(result, 31) + this.ks_1.hashCode() | 0;
+  var result = getStringHashCode(this.js_1);
+  result = imul(result, 31) + hashCode(this.ks_1) | 0;
+  result = imul(result, 31) + this.ls_1.hashCode() | 0;
   return result;
 };
 protoOf(Token).equals = function (other) {
@@ -6880,19 +6885,19 @@ protoOf(Token).equals = function (other) {
     return true;
   if (!(other instanceof Token))
     return false;
-  if (!(this.is_1 === other.is_1))
+  if (!(this.js_1 === other.js_1))
     return false;
-  if (!equals(this.js_1, other.js_1))
+  if (!equals(this.ks_1, other.ks_1))
     return false;
-  if (!this.ks_1.equals(other.ks_1))
+  if (!this.ls_1.equals(other.ls_1))
     return false;
   return true;
 };
 function plus_2(_this__u8e3s4, length) {
-  return new IdxAndLength(_this__u8e3s4.nv_1 + length | 0, length);
+  return new IdxAndLength(_this__u8e3s4.ov_1 + length | 0, length);
 }
 function plus_3(_this__u8e3s4, length) {
-  return _this__u8e3s4.qv(VOID, _this__u8e3s4.ms_1 + length | 0, plus_2(_this__u8e3s4.ns_1, length));
+  return _this__u8e3s4.rv(VOID, _this__u8e3s4.ns_1 + length | 0, plus_2(_this__u8e3s4.os_1, length));
 }
 function Keyword() {
 }
@@ -7625,20 +7630,20 @@ function WsBytes_getInstance() {
   return WsBytes_instance;
 }
 function WsInteger(precision) {
-  this.ot_1 = precision;
+  this.pt_1 = precision;
 }
 protoOf(WsInteger).toString = function () {
-  return 'WsInteger(precision=' + this.ot_1.toString() + ')';
+  return 'WsInteger(precision=' + this.pt_1.toString() + ')';
 };
 protoOf(WsInteger).hashCode = function () {
-  return this.ot_1.hashCode();
+  return this.pt_1.hashCode();
 };
 protoOf(WsInteger).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof WsInteger))
     return false;
-  if (!this.ot_1.equals(other.ot_1))
+  if (!this.pt_1.equals(other.pt_1))
     return false;
   return true;
 };
@@ -7656,20 +7661,20 @@ function Precision_0(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function WsNumber(precision) {
-  this.nt_1 = precision;
+  this.ot_1 = precision;
 }
 protoOf(WsNumber).toString = function () {
-  return 'WsNumber(precision=' + this.nt_1.toString() + ')';
+  return 'WsNumber(precision=' + this.ot_1.toString() + ')';
 };
 protoOf(WsNumber).hashCode = function () {
-  return this.nt_1.hashCode();
+  return this.ot_1.hashCode();
 };
 protoOf(WsNumber).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof WsNumber))
     return false;
-  if (!this.nt_1.equals(other.nt_1))
+  if (!this.ot_1.equals(other.ot_1))
     return false;
   return true;
 };
@@ -7762,7 +7767,7 @@ function StartOfProgram_getInstance() {
   return StartOfProgram_instance;
 }
 function EndOfProgram() {
-  this.tv_1 = 'EOP';
+  this.uv_1 = 'EOP';
 }
 protoOf(EndOfProgram).toString = function () {
   return 'EndOfProgram';
@@ -7803,17 +7808,17 @@ function TokenizeOptions(removeWhitespace, specifyTypes, specifyFieldIdentifiers
   removeWhitespace = removeWhitespace === VOID ? true : removeWhitespace;
   specifyTypes = specifyTypes === VOID ? true : specifyTypes;
   specifyFieldIdentifiers = specifyFieldIdentifiers === VOID ? true : specifyFieldIdentifiers;
-  this.uv_1 = removeWhitespace;
-  this.vv_1 = specifyTypes;
-  this.wv_1 = specifyFieldIdentifiers;
+  this.vv_1 = removeWhitespace;
+  this.wv_1 = specifyTypes;
+  this.xv_1 = specifyFieldIdentifiers;
 }
 protoOf(TokenizeOptions).toString = function () {
-  return 'TokenizeOptions(removeWhitespace=' + this.uv_1 + ', specifyTypes=' + this.vv_1 + ', specifyFieldIdentifiers=' + this.wv_1 + ')';
+  return 'TokenizeOptions(removeWhitespace=' + this.vv_1 + ', specifyTypes=' + this.wv_1 + ', specifyFieldIdentifiers=' + this.xv_1 + ')';
 };
 protoOf(TokenizeOptions).hashCode = function () {
-  var result = getBooleanHashCode(this.uv_1);
-  result = imul(result, 31) + getBooleanHashCode(this.vv_1) | 0;
+  var result = getBooleanHashCode(this.vv_1);
   result = imul(result, 31) + getBooleanHashCode(this.wv_1) | 0;
+  result = imul(result, 31) + getBooleanHashCode(this.xv_1) | 0;
   return result;
 };
 protoOf(TokenizeOptions).equals = function (other) {
@@ -7821,12 +7826,12 @@ protoOf(TokenizeOptions).equals = function (other) {
     return true;
   if (!(other instanceof TokenizeOptions))
     return false;
-  if (!(this.uv_1 === other.uv_1))
-    return false;
   if (!(this.vv_1 === other.vv_1))
     return false;
   if (!(this.wv_1 === other.wv_1))
     return false;
+  if (!(this.xv_1 === other.xv_1))
+    return false;
   return true;
 };
 function tokenize_1(_this__u8e3s4, source, incompleteTokens) {
@@ -7835,11 +7840,11 @@ function tokenize_1(_this__u8e3s4, source, incompleteTokens) {
   var incompleteTokens_0 = incompleteTokens;
   $l$1: do {
     $l$0: do {
-      var _destruct__k2r9zo = extractToken($this, source_0, last(new NonEmptyList(incompleteTokens_0)).ks_1);
+      var _destruct__k2r9zo = extractToken($this, source_0, last(new NonEmptyList(incompleteTokens_0)).ls_1);
       var token = _destruct__k2r9zo.ve();
       var remaining = _destruct__k2r9zo.we();
       var tokens = NonEmptyList__plus_impl_xqmb9(incompleteTokens_0, token);
-      var tmp0_subject = token.js_1;
+      var tmp0_subject = token.ks_1;
       var tmp;
       if (tmp0_subject instanceof EndOfProgram) {
         tmp = tokens;
@@ -7887,16 +7892,16 @@ function extractToken(_this__u8e3s4, source, previousTokenCoordinates) {
     tmp = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.is_1));
+    tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.js_1));
   }
   var tmp1_elvis_lhs = tmp;
   return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
 }
 function potentialRegex(_this__u8e3s4, source, incompleteTokens) {
-  var _destruct__k2r9zo = extractToken(_this__u8e3s4, source, last(new NonEmptyList(incompleteTokens)).ks_1);
+  var _destruct__k2r9zo = extractToken(_this__u8e3s4, source, last(new NonEmptyList(incompleteTokens)).ls_1);
   var token = _destruct__k2r9zo.ve();
   var remaining = _destruct__k2r9zo.we();
-  var tmp0_subject = token.js_1;
+  var tmp0_subject = token.ks_1;
   var tmp;
   if (tmp0_subject instanceof WhiteSpaceExceptNewLine) {
     tmp = potentialRegex(_this__u8e3s4, remaining, NonEmptyList__plus_impl_xqmb9(incompleteTokens, token));
@@ -7920,7 +7925,7 @@ function removeWhiteSpace(_this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    var tmp = element.js_1;
+    var tmp = element.ks_1;
     if (!isInterface(tmp, WhiteSpace)) {
       destination.x(element);
     }
@@ -7938,16 +7943,16 @@ function removeWhiteSpace(_this__u8e3s4) {
   return tmp_0;
 }
 function specifyType(_this__u8e3s4, entries) {
-  var tmp0_subject = _this__u8e3s4.js_1;
+  var tmp0_subject = _this__u8e3s4.ks_1;
   var tmp;
   if (isInterface(tmp0_subject, TypeIdentifier)) {
-    var tmp1_safe_receiver = entries.p2(_this__u8e3s4.is_1);
+    var tmp1_safe_receiver = entries.p2(_this__u8e3s4.js_1);
     var tmp_0;
     if (tmp1_safe_receiver == null) {
       tmp_0 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_0 = _this__u8e3s4.sv(VOID, tmp1_safe_receiver);
+      tmp_0 = _this__u8e3s4.tv(VOID, tmp1_safe_receiver);
     }
     var tmp2_elvis_lhs = tmp_0;
     tmp = tmp2_elvis_lhs == null ? _this__u8e3s4 : tmp2_elvis_lhs;
@@ -7957,7 +7962,7 @@ function specifyType(_this__u8e3s4, entries) {
   return tmp;
 }
 function specifyFieldIdentifier(_this__u8e3s4, caseVariants) {
-  var tmp0_subject = _this__u8e3s4.js_1;
+  var tmp0_subject = _this__u8e3s4.ks_1;
   var tmp;
   if (isInterface(tmp0_subject, FieldIdentifier_0)) {
     var tmp$ret$1;
@@ -7968,7 +7973,7 @@ function specifyFieldIdentifier(_this__u8e3s4, caseVariants) {
         var element = _iterator__ex2g4s.v();
         var regex = element.ve();
         var variant = element.we();
-        var result = regex.oc(removeBackticks(_this__u8e3s4.is_1)) ? _this__u8e3s4.sv(VOID, variant) : null;
+        var result = regex.oc(removeBackticks(_this__u8e3s4.js_1)) ? _this__u8e3s4.tv(VOID, variant) : null;
         if (!(result == null)) {
           tmp$ret$1 = result;
           break $l$block;
@@ -8024,7 +8029,7 @@ function extractRegex(_this__u8e3s4, source, regex, incompleteTokens) {
 function nextCoordinates(_this__u8e3s4, type, value) {
   var tmp;
   if (type instanceof NewLine) {
-    tmp = new Coordinates(_this__u8e3s4.ls_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.ns_1, value.length));
+    tmp = new Coordinates(_this__u8e3s4.ms_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.os_1, value.length));
   } else {
     // Inline function 'kotlin.text.count' call
     var count = 0;
@@ -8037,13 +8042,13 @@ function nextCoordinates(_this__u8e3s4, type, value) {
       }
     }
     var newLineCount = count;
-    tmp = newLineCount === 0 ? plus_3(_this__u8e3s4, value.length) : new Coordinates(_this__u8e3s4.ls_1 + newLineCount | 0, value.length - lastIndexOf(value, _Char___init__impl__6a9atx(10)) | 0, plus_2(_this__u8e3s4.ns_1, value.length));
+    tmp = newLineCount === 0 ? plus_3(_this__u8e3s4, value.length) : new Coordinates(_this__u8e3s4.ms_1 + newLineCount | 0, value.length - lastIndexOf(value, _Char___init__impl__6a9atx(10)) | 0, plus_2(_this__u8e3s4.os_1, value.length));
   }
   return tmp;
 }
 function nextToken_0(_this__u8e3s4, type, value) {
-  var tmp0_coordinates = nextCoordinates(_this__u8e3s4.ks_1, type, value);
-  return _this__u8e3s4.rv(value, type, tmp0_coordinates);
+  var tmp0_coordinates = nextCoordinates(_this__u8e3s4.ls_1, type, value);
+  return _this__u8e3s4.sv(value, type, tmp0_coordinates);
 }
 function optimize$lambda$lambda($this$runOption) {
   return new NonEmptyList(removeWhiteSpace($this$runOption.om_1));
@@ -8086,14 +8091,14 @@ function optimize$lambda$lambda_1($this_optimize) {
 }
 function optimize$lambda($options, $this_optimize) {
   return function (tokens) {
-    var tmp = runOption(tokens.om_1, $options.uv_1, optimize$lambda$lambda);
-    var tmp_0 = runOption(tmp, $options.vv_1, optimize$lambda$lambda_0($this_optimize));
-    return new NonEmptyList(runOption(tmp_0, $options.wv_1, optimize$lambda$lambda_1($this_optimize)));
+    var tmp = runOption(tokens.om_1, $options.vv_1, optimize$lambda$lambda);
+    var tmp_0 = runOption(tmp, $options.wv_1, optimize$lambda$lambda_0($this_optimize));
+    return new NonEmptyList(runOption(tmp_0, $options.xv_1, optimize$lambda$lambda_1($this_optimize)));
   };
 }
 function validateWithOptions($this, ast, options) {
   // Inline function 'arrow.core.NonEmptyList.map' call
-  var this_0 = ast.rq_1;
+  var this_0 = ast.sq_1;
   // Inline function 'kotlin.collections.map' call
   var this_1 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.mapTo' call
@@ -8102,7 +8107,7 @@ function validateWithOptions($this, ast, options) {
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
     var uri = item.ve();
-    var statements = item.kv();
+    var statements = item.lv();
     // Inline function 'arrow.core.Either.map' call
     // Inline function 'arrow.core.flatMap' call
     var this_2 = runValidateOptions(Validator_instance, options)(new NonEmptyList(statements));
@@ -8220,7 +8225,7 @@ function fillExtendsClause($this, _this__u8e3s4) {
                 while (_iterator__ex2g4s_1.u()) {
                   var element_0 = _iterator__ex2g4s_1.v();
                   // Inline function 'kotlin.collections.map' call
-                  var this_1 = element_0.hp_1;
+                  var this_1 = element_0.ip_1;
                   // Inline function 'kotlin.collections.mapTo' call
                   var destination_2 = ArrayList_init_$Create$(collectionSizeOrDefault_0(this_1, 10));
                   var _iterator__ex2g4s_2 = this_1.t();
@@ -8228,7 +8233,7 @@ function fillExtendsClause($this, _this__u8e3s4) {
                     var item_0 = _iterator__ex2g4s_2.v();
                     var tmp_1;
                     if (item_0 instanceof Custom) {
-                      tmp_1 = item_0.bv_1;
+                      tmp_1 = item_0.cv_1;
                     } else {
                       // Inline function 'arrow.core.nel' call
                       var this_2 = new UnionError();
@@ -8238,7 +8243,7 @@ function fillExtendsClause($this, _this__u8e3s4) {
                     var tmp$ret$3 = tmp_1;
                     destination_2.x(tmp$ret$3);
                   }
-                  if (destination_2.u1(item.lp_1.l1())) {
+                  if (destination_2.u1(item.mp_1.l1())) {
                     destination_1.x(element_0);
                   }
                 }
@@ -8248,10 +8253,10 @@ function fillExtendsClause($this, _this__u8e3s4) {
                 var _iterator__ex2g4s_3 = destination_1.t();
                 while (_iterator__ex2g4s_3.u()) {
                   var item_1 = _iterator__ex2g4s_3.v();
-                  var tmp$ret$9 = new Custom(item_1.gp_1.l1(), false);
+                  var tmp$ret$9 = new Custom(item_1.hp_1.l1(), false);
                   destination_3.x(tmp$ret$9);
                 }
-                tmp_0 = item.rt(VOID, VOID, VOID, VOID, destination_3);
+                tmp_0 = item.st(VOID, VOID, VOID, VOID, destination_3);
               } else {
                 if (item instanceof Union) {
                   tmp_0 = item;
@@ -8292,14 +8297,14 @@ function fillExtendsClause($this, _this__u8e3s4) {
 }
 function validateEndpoints($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.rq_1);
+  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.sq_1);
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = new NonEmptyList(element.tq_1);
+    var tmp0_0 = new NonEmptyList(element.uq_1);
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.t();
@@ -8318,7 +8323,7 @@ function validateEndpoints($this, ast) {
   var _iterator__ex2g4s_1 = destination.t();
   while (_iterator__ex2g4s_1.u()) {
     var element_1 = _iterator__ex2g4s_1.v();
-    var key = element_1.up_1.l1();
+    var key = element_1.vp_1.l1();
     // Inline function 'kotlin.collections.getOrPut' call
     var value = destination_1.p2(key);
     var tmp;
@@ -8378,14 +8383,14 @@ function validateEndpoints($this, ast) {
 }
 function validateTypes($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.rq_1);
+  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.sq_1);
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = new NonEmptyList(element.tq_1);
+    var tmp0_0 = new NonEmptyList(element.uq_1);
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.t();
@@ -8401,7 +8406,7 @@ function validateTypes($this, ast) {
     var _iterator__ex2g4s_1 = destination_0.t();
     while (_iterator__ex2g4s_1.u()) {
       var element_1 = _iterator__ex2g4s_1.v();
-      var key = element_1.lp_1.l1();
+      var key = element_1.mp_1.l1();
       // Inline function 'kotlin.collections.getOrPut' call
       var value = destination_1.p2(key);
       var tmp;
@@ -8464,14 +8469,14 @@ function validateTypes($this, ast) {
 }
 function validateChannels($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.rq_1);
+  var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.sq_1);
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = new NonEmptyList(element.tq_1);
+    var tmp0_0 = new NonEmptyList(element.uq_1);
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.t();
@@ -8490,7 +8495,7 @@ function validateChannels($this, ast) {
   var _iterator__ex2g4s_1 = destination.t();
   while (_iterator__ex2g4s_1.u()) {
     var element_1 = _iterator__ex2g4s_1.v();
-    var key = element_1.cp_1.l1();
+    var key = element_1.dp_1.l1();
     // Inline function 'kotlin.collections.getOrPut' call
     var value = destination_1.p2(key);
     var tmp;
@@ -8554,12 +8559,12 @@ function Validator$runValidateOptions$lambda$lambda($this$runOption) {
 function Validator$runValidateOptions$lambda($options) {
   return function (it) {
     var tmp = Validator_instance;
-    return runOption_0(tmp, it.om_1, $options.gt_1, Validator$runValidateOptions$lambda$lambda);
+    return runOption_0(tmp, it.om_1, $options.ht_1, Validator$runValidateOptions$lambda$lambda);
   };
 }
 function Validator() {
 }
-protoOf(Validator).it = function (options, ast) {
+protoOf(Validator).jt = function (options, ast) {
   var tmp2 = validateWithOptions(this, ast, options);
   var tmp4 = validateEndpoints(this, ast);
   var tmp6 = validateTypes(this, ast);
@@ -8815,18 +8820,18 @@ function Logger(logLevel) {
   }
   tmp_5.bo_1 = tmp_6;
 }
-protoOf(Logger).xv = function () {
+protoOf(Logger).yv = function () {
   return this.yn_1;
 };
-protoOf(Logger).yv = function () {
+protoOf(Logger).zv = function () {
   return this.zn_1;
 };
 protoOf(Logger).co = function (string) {
-  return logIf(this, string, this.xv());
-};
-protoOf(Logger).jr = function (string) {
   return logIf(this, string, this.yv());
 };
+protoOf(Logger).kr = function (string) {
+  return logIf(this, string, this.zv());
+};
 function noLogger$1() {
   Logger.call(this, null);
 }
@@ -8838,14 +8843,14 @@ function _init_properties_Logger_kt__mpqsw() {
   }
 }
 //region block: post-declaration
-protoOf(LanguageEmitter).pq = get_expression;
-protoOf(LanguageEmitter).wq = notYetImplemented;
-protoOf(Any).vu = copy;
-protoOf(Unit).vu = copy;
-protoOf(Dict_0).vu = copy;
-protoOf(Iterable).vu = copy;
-protoOf(Custom).vu = copy;
-protoOf(Primitive).vu = copy;
+protoOf(LanguageEmitter).qq = get_expression;
+protoOf(LanguageEmitter).xq = notYetImplemented;
+protoOf(Any).wu = copy;
+protoOf(Unit).wu = copy;
+protoOf(Dict_0).wu = copy;
+protoOf(Iterable).wu = copy;
+protoOf(Custom).wu = copy;
+protoOf(Primitive).wu = copy;
 //endregion
 //region block: init
 Companion_instance_0 = new Companion();