@flock/wirespec 0.10.11 → 0.10.13

package/wirespec-src-compiler-core.js

@@ -48,6 +48,7 @@
   var first = kotlin_kotlin.$_$.qc;
   var Char = kotlin_kotlin.$_$.se;
   var distinct = kotlin_kotlin.$_$.y5;
+  var HashSet_init_$Create$ = kotlin_kotlin.$_$.r;
   var trimMargin = kotlin_kotlin.$_$.me;
   var listOfNotNull = kotlin_kotlin.$_$.f7;
   var split = kotlin_kotlin.$_$.od;
@@ -67,7 +68,6 @@
   var dropLast = kotlin_kotlin.$_$.kc;
   var replace = kotlin_kotlin.$_$.jd;
   var first_0 = kotlin_kotlin.$_$.h6;
-  var HashSet_init_$Create$ = kotlin_kotlin.$_$.r;
   var trimIndent = kotlin_kotlin.$_$.le;
   var prependIndent = kotlin_kotlin.$_$.ed;
   var toSet = kotlin_kotlin.$_$.p8;
@@ -83,7 +83,6 @@
   var IndexedValue = kotlin_kotlin.$_$.n4;
   var listOfNotNull_0 = kotlin_kotlin.$_$.e7;
   var flatten = kotlin_kotlin.$_$.j6;
-  var initMetadataForInterface = kotlin_kotlin.$_$.aa;
   var captureStack = kotlin_kotlin.$_$.i9;
   var RuntimeException = kotlin_kotlin.$_$.hf;
   var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.r1;
@@ -95,7 +94,7 @@
   var emptyList = kotlin_kotlin.$_$.b6;
   var drop = kotlin_kotlin.$_$.lc;
   var toList = kotlin_kotlin.$_$.k8;
-  var getKClassFromExpression = kotlin_kotlin.$_$.d;
+  var initMetadataForInterface = kotlin_kotlin.$_$.aa;
   var toString_1 = kotlin_kotlin.$_$.gg;
   var THROW_IAE = kotlin_kotlin.$_$.jf;
   var enumEntries = kotlin_kotlin.$_$.a9;
@@ -111,6 +110,7 @@
   var last = kotlin_kotlin.$_$.c7;
   var Pair = kotlin_kotlin.$_$.ff;
   var toNonEmptyListOrNull = kotlin_io_arrow_kt_arrow_core.$_$.j;
+  var getKClassFromExpression = kotlin_kotlin.$_$.d;
   var ensureNotNull = kotlin_kotlin.$_$.yf;
   var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.l1;
   var println = kotlin_kotlin.$_$.b9;
@@ -119,11 +119,7 @@
   initMetadataForClass(Reported, 'Reported', VOID, Enum);
   initMetadataForObject(WirespecSpec, 'WirespecSpec');
   initMetadataForCompanion(Companion);
-  function emit(_this__u8e3s4, type) {
-    return _this__u8e3s4.y22_1;
-  }
-  initMetadataForInterface(IdentifierEmitter, 'IdentifierEmitter');
-  initMetadataForClass(Emitter, 'Emitter', VOID, VOID, [IdentifierEmitter]);
+  initMetadataForClass(Emitter, 'Emitter');
   initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, Emitter);
   initMetadataForCompanion(Companion_0);
   initMetadataForClass(KotlinEmitter, 'KotlinEmitter', KotlinEmitter, Emitter);
@@ -152,16 +148,14 @@
   initMetadataForClass(EnumParser, 'EnumParser', VOID, AbstractParser);
   initMetadataForInterface(Definition, 'Definition');
   initMetadataForClass(Comment, 'Comment');
-  initMetadataForClass(Type, 'Type', VOID, Enum);
-  initMetadataForCompanion(Companion_5);
   initMetadataForClass(Identifier, 'Identifier');
-  initMetadataForClass(Type_0, 'Type', VOID, Enum);
+  initMetadataForClass(Type, 'Type', VOID, Enum);
   initMetadataForClass(Any, 'Any');
   initMetadataForClass(Unit, 'Unit');
   initMetadataForClass(Custom, 'Custom');
   initMetadataForClass(Primitive, 'Primitive');
   initMetadataForClass(Shape, 'Shape');
-  initMetadataForClass(Type_1, 'Type', VOID, VOID, [Definition]);
+  initMetadataForClass(Type_0, 'Type', VOID, VOID, [Definition]);
   initMetadataForClass(Literal, 'Literal');
   initMetadataForClass(Param_0, 'Param');
   initMetadataForClass(Method, 'Method', VOID, Enum);
@@ -174,7 +168,9 @@
   initMetadataForClass(Refined, 'Refined', VOID, VOID, [Definition]);
   initMetadataForClass(Union, 'Union', VOID, VOID, [Definition]);
   initMetadataForClass(Channel, 'Channel', VOID, VOID, [Definition]);
+  initMetadataForClass(FieldIdentifier, 'FieldIdentifier', VOID, Identifier);
   initMetadataForClass(Field, 'Field');
+  initMetadataForClass(DefinitionIdentifier, 'DefinitionIdentifier', VOID, Identifier);
   initMetadataForClass(Parser, 'Parser', VOID, AbstractParser);
   initMetadataForClass(TokenProvider, 'TokenProvider');
   initMetadataForClass(TypeParser, 'TypeParser', VOID, AbstractParser);
@@ -216,7 +212,7 @@
   initMetadataForObject(Character, 'Character');
   initMetadataForObject(StartOfProgram, 'StartOfProgram', VOID, VOID, [WhiteSpace]);
   initMetadataForObject(EndOfProgram, 'EndOfProgram');
-  initMetadataForCompanion(Companion_6);
+  initMetadataForCompanion(Companion_5);
   initMetadataForClass(Level, 'Level', VOID, Enum);
   initMetadataForClass(Logger, 'Logger');
   initMetadataForClass(noLogger$1, VOID, VOID, Logger);
@@ -503,7 +499,7 @@
         while (tmp0_iterator_2.h()) {
           var element_2 = tmp0_iterator_2.i();
           // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitUnion.<anonymous>.<anonymous>' call
-          if (element_2.v22_1 === _this__u8e3s4.a23_1.y22_1) {
+          if (element_2.v22_1 === _this__u8e3s4.z22_1.b1()) {
             tmp$ret$4 = true;
             break $l$block_0;
           }
@@ -520,7 +516,7 @@
     while (tmp0_iterator_3.h()) {
       var item = tmp0_iterator_3.i();
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitUnion.<anonymous>' call
-      var tmp$ret$9 = item.t22_1.y22_1;
+      var tmp$ret$9 = item.t22_1.b1();
       destination_2.e(tmp$ret$9);
     }
     // Inline function 'kotlin.contracts.contract' call
@@ -545,10 +541,10 @@
         tmp = 'Object';
       } else {
         if (_this__u8e3s4 instanceof Custom) {
-          tmp = emit_0(_this__u8e3s4, $this);
+          tmp = emit(_this__u8e3s4, $this);
         } else {
           if (_this__u8e3s4 instanceof Primitive) {
-            tmp = emit_1(_this__u8e3s4, $this);
+            tmp = emit_0(_this__u8e3s4, $this);
           } else {
             noWhenBranchMatchedException();
           }
@@ -561,7 +557,7 @@
     void_0 = void_0 === VOID ? 'void' : void_0;
     return emitType(_this__u8e3s4, $this, void_0);
   }
-  function emit_0(_this__u8e3s4, $this) {
+  function emit(_this__u8e3s4, $this) {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.text.orEmpty' call
     // Inline function 'kotlin.takeIf' call
@@ -589,7 +585,7 @@
     var tmp$ret$6 = (tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs) + _this__u8e3s4.v22_1;
     return sanitizeSymbol(tmp$ret$6, $this);
   }
-  function emit_1(_this__u8e3s4, $this) {
+  function emit_0(_this__u8e3s4, $this) {
     var tmp;
     switch (_this__u8e3s4.i23_1.q2_1) {
       case 0:
@@ -627,15 +623,27 @@
   }
   function emitResponseInterfaces(_this__u8e3s4, $this) {
     // Inline function 'kotlin.collections.map' call
+    // Inline function 'kotlin.collections.distinctBy' call
     var this_0 = _this__u8e3s4.u23_1;
-    // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+    var set = HashSet_init_$Create$();
+    var list = ArrayList_init_$Create$();
     var tmp0_iterator = this_0.g();
     while (tmp0_iterator.h()) {
-      var item = tmp0_iterator.i();
+      var e = tmp0_iterator.i();
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseInterfaces.<anonymous>' call
-      var tmp$ret$0 = emit_2(item.x23_1, $this);
-      destination.e(tmp$ret$0);
+      var key = e.v23_1;
+      if (set.e(key)) {
+        list.e(e);
+      }
+    }
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(list, 10));
+    var tmp0_iterator_0 = list.g();
+    while (tmp0_iterator_0.h()) {
+      var item = tmp0_iterator_0.i();
+      // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseInterfaces.<anonymous>' call
+      var tmp$ret$2 = emit_1(item.x23_1, $this);
+      destination.e(tmp$ret$2);
     }
     var tmp = distinct(destination);
     return joinToString(tmp, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emitResponseInterfaces$lambda);
@@ -675,7 +683,7 @@
     }
     var tmp_9 = tmp_8;
     var tmp_10 = Spacer_instance.z23(4);
-    var tmp_11 = emit_2(_this__u8e3s4.a24_1, $this);
+    var tmp_11 = emit_1(_this__u8e3s4.a24_1, $this);
     var tmp0_safe_receiver = _this__u8e3s4.a24_1;
     var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c24_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.e24();
@@ -694,7 +702,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitConstructor.<anonymous>' call
-      tmp_3 = emit_2(tmp0_safe_receiver, $this) + ' body';
+      tmp_3 = emit_1(tmp0_safe_receiver, $this) + ' body';
     }
     var tmp_4 = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]));
     var tmp_5 = Spacer_instance.z23(3);
@@ -738,7 +746,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
-      tmp_3 = Spacer_instance.z23(4) + 'serialization.deserialize(request.body(), Wirespec.getType(' + emit_2(tmp0_safe_receiver, $this) + '.class, ' + tmp0_safe_receiver.c24_1.e24() + '))';
+      tmp_3 = Spacer_instance.z23(4) + 'serialization.deserialize(request.body(), Wirespec.getType(' + emit_1(tmp0_safe_receiver, $this) + '.class, ' + tmp0_safe_receiver.c24_1.e24() + '))';
     }
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
@@ -779,32 +787,32 @@
     return Spacer_instance.z23(4) + 'case ' + _this__u8e3s4.v23_1 + ' -> new Response' + Companion_getInstance_3().h24(_this__u8e3s4.v23_1) + '(' + emitDeserializedParams_0(_this__u8e3s4, $this) + ');';
   }
   function emitSerialized_0(_this__u8e3s4, $this, fields) {
-    return 'java.util.Map.entry("' + _this__u8e3s4.i24_1.y22_1 + '", serialization.serialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))';
+    return 'java.util.Map.entry("' + _this__u8e3s4.i24_1.b1() + '", serialization.serialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))';
   }
   function emitDeserialized_0(_this__u8e3s4, $this) {
     return Spacer_instance.z23(4) + 'serialization.<' + $this.o24(_this__u8e3s4.pd_1.n24_1) + '>deserialize(request.path().get(' + _this__u8e3s4.od_1 + '), Wirespec.getType(' + emitType$default(_this__u8e3s4.pd_1.n24_1, $this) + '.class, ' + _this__u8e3s4.pd_1.n24_1.e24() + '))';
   }
   function emitDeserialized_1(_this__u8e3s4, $this, fields) {
-    return Spacer_instance.z23(4) + 'java.util.Optional.ofNullable(request.' + fields + '().get("' + _this__u8e3s4.i24_1.y22_1 + '")).map(it -> serialization.<' + $this.o24(_this__u8e3s4.j24_1) + '>deserialize(it, Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))' + (!_this__u8e3s4.k24_1 ? '.get()' : '');
+    return Spacer_instance.z23(4) + 'java.util.Optional.ofNullable(request.' + fields + '().get("' + _this__u8e3s4.i24_1.b1() + '")).map(it -> serialization.<' + $this.o24(_this__u8e3s4.j24_1) + '>deserialize(it, Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))' + (!_this__u8e3s4.k24_1 ? '.get()' : '');
   }
-  function emitSerializedMap(_this__u8e3s4, $this, fields) {
-    return 'java.util.Map.entry("' + _this__u8e3s4.i24_1.y22_1 + '", serialization.serialize(response.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))';
+  function emitSerializedHeader(_this__u8e3s4, $this) {
+    return 'java.util.Map.entry("' + _this__u8e3s4.i24_1.b1() + '", serialization.serialize(r.getHeaders().' + $this.l24(_this__u8e3s4.i24_1) + '(), Wirespec.getType(' + emitType$default(_this__u8e3s4.j24_1, $this) + '.class, ' + _this__u8e3s4.j24_1.e24() + ')))';
   }
   function emitIdentifier(_this__u8e3s4, $this) {
-    return 'serialization.serialize(request.path.' + Companion_getInstance_3().p24($this.l24(_this__u8e3s4.m24_1, Type_Field_getInstance())) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.n24_1, $this) + '.class, ' + _this__u8e3s4.n24_1.e24() + '))';
+    return 'serialization.serialize(request.path.' + Companion_getInstance_3().p24($this.l24(_this__u8e3s4.m24_1)) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.n24_1, $this) + '.class, ' + _this__u8e3s4.n24_1.e24() + '))';
   }
   function emitType_0(_this__u8e3s4, $this) {
     var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.c24_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : emitType$default(tmp1_safe_receiver, $this);
     return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
   }
-  function emit_2(_this__u8e3s4, $this) {
+  function emit_1(_this__u8e3s4, $this) {
     var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.c24_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.o24(tmp1_safe_receiver);
     return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
   }
-  function emit_3(_this__u8e3s4, $this) {
-    return $this.o24(_this__u8e3s4.n24_1) + ' ' + $this.l24(_this__u8e3s4.m24_1, Type_Field_getInstance());
+  function emit_2(_this__u8e3s4, $this) {
+    return $this.o24(_this__u8e3s4.n24_1) + ' ' + $this.l24(_this__u8e3s4.m24_1);
   }
   function emitWrap(_this__u8e3s4, $this, isNullable) {
     // Inline function 'kotlin.let' call
@@ -815,10 +823,10 @@
     var it = _this__u8e3s4.b1();
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitWrap.<anonymous>' call
-    var it_0 = _this__u8e3s4.e24() ? 'java.util.Optional<' + it + '>' : it;
+    var it_0 = isNullable ? 'java.util.Optional<' + it + '>' : it;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitWrap.<anonymous>' call
-    var it_1 = isNullable ? 'java.util.List<' + it_0 + '>' : it_0;
+    var it_1 = _this__u8e3s4.e24() ? 'java.util.List<' + it_0 + '>' : it_0;
     return _this__u8e3s4.q24() ? 'java.util.Map<String, ' + it_1 + '>' : it_1;
   }
   function fixStatus(_this__u8e3s4, $this) {
@@ -882,7 +890,7 @@
   }
   function JavaEmitter$emit$lambda_3(this$0) {
     return function (it) {
-      return emit_3(it, this$0);
+      return emit_2(it, this$0);
     };
   }
   function JavaEmitter$emit$lambda_4(this$0) {
@@ -958,7 +966,7 @@
   }
   function JavaEmitter$emit$lambda_11(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1);
     };
   }
   function JavaEmitter$emit$lambda_12(this$0) {
@@ -968,7 +976,7 @@
   }
   function JavaEmitter$emitConstructor$lambda(this$0) {
     return function (it) {
-      return emit_3(it, this$0);
+      return emit_2(it, this$0);
     };
   }
   function JavaEmitter$emitConstructor$lambda_0(this$0) {
@@ -983,17 +991,17 @@
   }
   function JavaEmitter$emitConstructor$lambda_2(this$0) {
     return function (it) {
-      return this$0.l24(it.m24_1, Type_Field_getInstance());
+      return this$0.l24(it.m24_1);
     };
   }
   function JavaEmitter$emitConstructor$lambda_3(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1);
     };
   }
   function JavaEmitter$emitConstructor$lambda_4(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1);
     };
   }
   function JavaEmitter$emitDeserializedParams$lambda(this$0) {
@@ -1013,12 +1021,12 @@
   }
   function JavaEmitter$emitDeserializedParams$lambda_2(this$0) {
     return function (it) {
-      return Spacer_instance.z23(4) + 'java.util.Optional.ofNullable(response.headers().get("' + it.i24_1.y22_1 + '")).map(it -> serialization.deserialize(it, Wirespec.getType(' + emitType$default(it.j24_1, this$0) + '.class, ' + it.j24_1.e24() + ')))' + (!it.k24_1 ? '.get()' : '');
+      return Spacer_instance.z23(4) + 'java.util.Optional.ofNullable(response.headers().get("' + it.i24_1.b1() + '")).map(it -> serialization.deserialize(it, Wirespec.getType(' + emitType$default(it.j24_1, this$0) + '.class, ' + it.j24_1.e24() + ')))' + (!it.k24_1 ? '.get()' : '');
     };
   }
   function JavaEmitter$emitSerialized$lambda(this$0) {
     return function (it) {
-      return emitSerializedMap(it, this$0, 'headers');
+      return emitSerializedHeader(it, this$0);
     };
   }
   function JavaEmitter$sanitizeSymbol$lambda(it) {
@@ -1041,22 +1049,22 @@
   protoOf(JavaEmitter).x24 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Endpoint) {
-      tmp = this.l24(_this__u8e3s4.n23_1, Type_Class_getInstance()) + 'Endpoint';
+      tmp = this.l24(_this__u8e3s4.n23_1) + 'Endpoint';
     } else {
       if (_this__u8e3s4 instanceof Channel) {
-        tmp = this.l24(_this__u8e3s4.f25_1, Type_Class_getInstance()) + 'Channel';
+        tmp = this.l24(_this__u8e3s4.f25_1) + 'Channel';
       } else {
         if (_this__u8e3s4 instanceof Enum_0) {
-          tmp = this.l24(_this__u8e3s4.c25_1, Type_Class_getInstance());
+          tmp = this.l24(_this__u8e3s4.c25_1);
         } else {
           if (_this__u8e3s4 instanceof Refined) {
-            tmp = this.l24(_this__u8e3s4.z24_1, Type_Class_getInstance());
+            tmp = this.l24(_this__u8e3s4.z24_1);
           } else {
-            if (_this__u8e3s4 instanceof Type_1) {
-              tmp = this.l24(_this__u8e3s4.a23_1, Type_Class_getInstance());
+            if (_this__u8e3s4 instanceof Type_0) {
+              tmp = this.l24(_this__u8e3s4.z22_1);
             } else {
               if (_this__u8e3s4 instanceof Union) {
-                tmp = this.l24(_this__u8e3s4.t22_1, Type_Class_getInstance());
+                tmp = this.l24(_this__u8e3s4.t22_1);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -1089,11 +1097,11 @@
   };
   protoOf(JavaEmitter).l25 = function (type, ast) {
     var tmp = this.x24(type);
-    var tmp_0 = this.m25(type.b23_1);
+    var tmp_0 = this.m25(type.a23_1);
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-    var $this$run = type.c23_1;
+    var $this$run = type.b23_1;
     var tmp_1;
     if ($this$run.l()) {
       tmp_1 = '';
@@ -1107,7 +1115,7 @@
     return dropLast(joinToString(_this__u8e3s4.n25_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_0(this)), 1);
   };
   protoOf(JavaEmitter).s24 = function (_this__u8e3s4) {
-    return (_this__u8e3s4.k24_1 ? 'java.util.Optional<' + this.o24(_this__u8e3s4.j24_1) + '>' : this.o24(_this__u8e3s4.j24_1)) + ' ' + this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance());
+    return (_this__u8e3s4.k24_1 ? 'java.util.Optional<' + this.o24(_this__u8e3s4.j24_1) + '>' : this.o24(_this__u8e3s4.j24_1)) + ' ' + this.l24(_this__u8e3s4.i24_1);
   };
   protoOf(JavaEmitter).o24 = function (_this__u8e3s4) {
     // Inline function 'kotlin.let' call
@@ -1120,40 +1128,38 @@
     var it_0 = _this__u8e3s4.e24() ? 'java.util.List<' + it + '>' : it;
     return _this__u8e3s4.q24() ? 'java.util.Map<String, ' + it_0 + '>' : it_0;
   };
-  protoOf(JavaEmitter).l24 = function (_this__u8e3s4, type) {
+  protoOf(JavaEmitter).l24 = function (identifier) {
     var tmp;
-    switch (type.q2_1) {
-      case 0:
-        tmp = Companion_getInstance_3().h24(sanitizeSymbol(_this__u8e3s4.y22_1, this));
-        break;
-      case 1:
-        tmp = sanitizeKeywords(Companion_getInstance_3().p24(sanitizeSymbol(_this__u8e3s4.y22_1, this)), this);
-        break;
-      default:
+    if (identifier instanceof DefinitionIdentifier) {
+      tmp = Companion_getInstance_3().h24(sanitizeSymbol(identifier.b1(), this));
+    } else {
+      if (identifier instanceof FieldIdentifier) {
+        tmp = sanitizeKeywords(Companion_getInstance_3().p24(sanitizeSymbol(identifier.b1(), this)), this);
+      } else {
         noWhenBranchMatchedException();
-        break;
+      }
     }
     return tmp;
   };
   protoOf(JavaEmitter).o25 = function (refined) {
-    return trimMargin('\n        |public record ' + this.l24(refined.z24_1, Type_Class_getInstance()) + ' (String value) implements Wirespec.Refined {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value; }\n        |' + Spacer_instance.toString() + 'public static boolean validate(' + this.x24(refined) + ' record) {\n        |' + Spacer_instance.toString() + this.p25(refined.a25_1) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getValue() { return value; }\n        |}\n        |\n    ');
+    return trimMargin('\n        |public record ' + this.l24(refined.z24_1) + ' (String value) implements Wirespec.Refined {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value; }\n        |' + Spacer_instance.toString() + 'public static boolean validate(' + this.x24(refined) + ' record) {\n        |' + Spacer_instance.toString() + this.p25(refined.a25_1) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getValue() { return value; }\n        |}\n        |\n    ');
   };
   protoOf(JavaEmitter).p25 = function (_this__u8e3s4) {
     return Spacer_instance.toString() + 'return java.util.regex.Pattern.compile("' + replace(_this__u8e3s4.r25_1, '\\', '\\\\') + '").matcher(record.value).find();';
   };
   protoOf(JavaEmitter).s25 = function (enum_0) {
-    var tmp = this.l24(enum_0.c25_1, Type_Class_getInstance());
-    return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + this.t25(joinToString(enum_0.d25_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_1(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.l24(enum_0.c25_1, Type_Class_getInstance()) + '(String label) {\n        |' + Spacer_instance.z23(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.z23(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getLabel() {\n        |' + Spacer_instance.z23(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+    var tmp = this.l24(enum_0.c25_1);
+    return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + this.t25(joinToString(enum_0.d25_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_1(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.l24(enum_0.c25_1) + '(String label) {\n        |' + Spacer_instance.z23(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.z23(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getLabel() {\n        |' + Spacer_instance.z23(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
   };
   protoOf(JavaEmitter).u25 = function (union) {
     var tmp = this.x24(union);
     return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.u22_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_2) + ' {}\n        |\n    ');
   };
   protoOf(JavaEmitter).v25 = function (channel) {
-    return trimMargin('\n        |interface ' + this.l24(channel.f25_1, Type_Class_getInstance()) + 'Channel {\n        |   void invoke(' + emitWrap(channel.h25_1, this, channel.g25_1) + ' message)\n        |}\n        |\n    ');
+    return trimMargin('\n        |interface ' + this.l24(channel.f25_1) + 'Channel {\n        |   void invoke(' + emitWrap(channel.h25_1, this, channel.g25_1) + ' message)\n        |}\n        |\n    ');
   };
   protoOf(JavaEmitter).w25 = function (endpoint) {
-    var tmp = this.l24(endpoint.n23_1, Type_Class_getInstance());
+    var tmp = this.l24(endpoint.n23_1);
     var tmp_0 = this.f24(endpoint);
     var tmp_1 = emitObject(tmp_0, this, 'Path', 'Wirespec.Path', JavaEmitter$emit$lambda_3(this));
     var tmp_2 = emitObject(endpoint.q23_1, this, 'Queries', 'Wirespec.Queries', JavaEmitter$emit$lambda_4(this));
@@ -1235,10 +1241,10 @@
     return trimMargin('\n        |public interface ' + tmp + 'Endpoint extends Wirespec.Endpoint {\n        |' + tmp_1 + '\n        |\n        |' + tmp_2 + '\n        |\n        |' + tmp_3 + '\n        |\n        |' + tmp_4 + '\n        |\n        |' + tmp_5 + 'sealed interface Response<T> extends Wirespec.Response<T> {}\n        |' + tmp_6 + '\n        |' + tmp_7 + '\n        |\n        |' + tmp_9 + '\n        |\n        |' + tmp_10 + 'interface Handler extends Wirespec.Handler {\n        |\n        |' + tmp_11 + '\n        |\n        |' + tmp_12 + 'static Wirespec.RawResponse toResponse(Wirespec.Serializer<String> serialization, Response<?> response) {\n        |' + tmp_14 + '\n        |' + tmp_15 + 'else { throw new IllegalStateException("Cannot match response with status: " + response.getStatus());}\n        |' + tmp_16 + '}\n        |\n        |' + tmp_17 + 'static Response<?> fromResponse(Wirespec.Deserializer<String> serialization, Wirespec.RawResponse response) {\n        |' + tmp_18 + 'return switch (response.statusCode()) {\n        |' + tmp_20 + '\n        |' + tmp_21 + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n        |' + tmp_22 + '};\n        |' + tmp_23 + '}\n        |\n        |' + tmp_24 + tmp_25 + '\n        |' + tmp_26 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_27 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.p23_1, '/', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_9(this)) + '"; }\n        |' + Spacer_instance.z23(3) + '@Override public String getMethod() { return "' + endpoint.o23_1.toString() + '"; }\n        |' + Spacer_instance.z23(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization<String> serialization) {\n        |' + Spacer_instance.z23(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.z23(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.z23(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.z23(4) + '};\n        |' + Spacer_instance.z23(3) + '}\n        |' + Spacer_instance.z23(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization<String> serialization) {\n        |' + Spacer_instance.z23(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.z23(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.z23(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.z23(4) + '};\n        |' + Spacer_instance.z23(3) + '}\n        |' + Spacer_instance.z23(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
   };
   protoOf(JavaEmitter).z25 = function (endpoint) {
-    return 'java.util.concurrent.CompletableFuture<Response<?>> ' + this.l24(endpoint.n23_1, Type_Field_getInstance()) + '(Request request);';
+    return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_getInstance_3().p24(this.l24(endpoint.n23_1)) + '(Request request);';
   };
   protoOf(JavaEmitter).x25 = function (_this__u8e3s4, endpoint) {
-    return trimMargin('\n        |' + Spacer_instance.toString() + 'class Request implements Wirespec.Request<' + emit_2(_this__u8e3s4.a24_1, this) + '> {\n        |' + Spacer_instance.z23(2) + 'private final Path path;\n        |' + Spacer_instance.z23(2) + 'private final Wirespec.Method method;\n        |' + Spacer_instance.z23(2) + 'private final Queries queries;\n        |' + Spacer_instance.z23(2) + 'private final RequestHeaders headers;\n        |' + Spacer_instance.z23(2) + 'private final ' + emit_2(_this__u8e3s4.a24_1, this) + ' body;\n        |' + Spacer_instance.z23(2) + emitConstructor(_this__u8e3s4, this, endpoint) + '\n        |' + Spacer_instance.z23(2) + '@Override public Path getPath() { return path; }\n        |' + Spacer_instance.z23(2) + '@Override public Wirespec.Method getMethod() { return method; }\n        |' + Spacer_instance.z23(2) + '@Override public Queries getQueries() { return queries; }\n        |' + Spacer_instance.z23(2) + '@Override public RequestHeaders getHeaders() { return headers; }\n        |' + Spacer_instance.z23(2) + '@Override public ' + emit_2(_this__u8e3s4.a24_1, this) + ' getBody() { return body; }\n        |' + Spacer_instance.toString() + '}\n    ');
+    return trimMargin('\n        |' + Spacer_instance.toString() + 'class Request implements Wirespec.Request<' + emit_1(_this__u8e3s4.a24_1, this) + '> {\n        |' + Spacer_instance.z23(2) + 'private final Path path;\n        |' + Spacer_instance.z23(2) + 'private final Wirespec.Method method;\n        |' + Spacer_instance.z23(2) + 'private final Queries queries;\n        |' + Spacer_instance.z23(2) + 'private final RequestHeaders headers;\n        |' + Spacer_instance.z23(2) + 'private final ' + emit_1(_this__u8e3s4.a24_1, this) + ' body;\n        |' + Spacer_instance.z23(2) + emitConstructor(_this__u8e3s4, this, endpoint) + '\n        |' + Spacer_instance.z23(2) + '@Override public Path getPath() { return path; }\n        |' + Spacer_instance.z23(2) + '@Override public Wirespec.Method getMethod() { return method; }\n        |' + Spacer_instance.z23(2) + '@Override public Queries getQueries() { return queries; }\n        |' + Spacer_instance.z23(2) + '@Override public RequestHeaders getHeaders() { return headers; }\n        |' + Spacer_instance.z23(2) + '@Override public ' + emit_1(_this__u8e3s4.a24_1, this) + ' getBody() { return body; }\n        |' + Spacer_instance.toString() + '}\n    ');
   };
   protoOf(JavaEmitter).t24 = function (_this__u8e3s4) {
     var tmp = Spacer_instance.toString();
@@ -1252,12 +1258,12 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp_2 = emit_2(tmp0_safe_receiver, this) + ' body';
+      tmp_2 = emit_1(tmp0_safe_receiver, this) + ' body';
     }
     var tmp_3 = joinToString(listOfNotNull([tmp_1, tmp_2]));
     var tmp_4 = toString_0(first(_this__u8e3s4.v23_1));
-    var tmp_5 = emit_2(_this__u8e3s4.x23_1, this);
-    var tmp_6 = concatGenerics(emit_2(_this__u8e3s4.x23_1, this));
+    var tmp_5 = emit_1(_this__u8e3s4.x23_1, this);
+    var tmp_6 = concatGenerics(emit_1(_this__u8e3s4.x23_1, this));
     var tmp_7 = Spacer_instance.z23(2);
     var tmp_8 = fixStatus(_this__u8e3s4.v23_1, this);
     var tmp_9 = Spacer_instance.z23(2);
@@ -1266,7 +1272,7 @@
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
     var tmp_10 = '@Override public Headers getHeaders() { return new Headers(' + joinToString(_this__u8e3s4.w23_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_11(this)) + '); }';
     var tmp_11 = Spacer_instance.z23(2);
-    var tmp_12 = emit_2(_this__u8e3s4.x23_1, this);
+    var tmp_12 = emit_1(_this__u8e3s4.x23_1, this);
     var tmp_13 = _this__u8e3s4.x23_1 == null ? 'null' : 'body';
     var tmp_14 = Spacer_instance.z23(1);
     return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(' + tmp_3 + ') implements Response' + tmp_4 + 'XX<' + tmp_5 + '>, Response' + tmp_6 + ' {\n        |' + tmp_7 + '@Override public int getStatus() { return ' + tmp_8 + '; }\n        |' + tmp_9 + tmp_10 + '\n        |' + tmp_11 + '@Override public ' + tmp_12 + ' getBody() { return ' + tmp_13 + '; }\n        |' + tmp_14 + emitObject(_this__u8e3s4.w23_1, this, 'Headers', 'Wirespec.Response.Headers', JavaEmitter$emit$lambda_12(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
@@ -1295,7 +1301,7 @@
     while (tmp0_iterator.h()) {
       var item = tmp0_iterator.i();
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseInterfaces.<anonymous>' call
-      var tmp$ret$0 = emit_4(item.x23_1, $this);
+      var tmp$ret$0 = emit_3(item.x23_1, $this);
       destination.e(tmp$ret$0);
     }
     var tmp = distinct(destination);
@@ -1325,12 +1331,12 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitConstructor.<anonymous>' call
-      tmp_3 = Spacer_instance.z23(2) + 'override val body: ' + emit_4(tmp0_safe_receiver, $this) + ',';
+      tmp_3 = Spacer_instance.z23(2) + 'override val body: ' + emit_3(tmp0_safe_receiver, $this) + ',';
     }
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitConstructor.<anonymous>' call
     var it = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]), ',\n');
-    return isBlank(it) ? 'object Request : Wirespec.Request<' + emit_4(_this__u8e3s4.a24_1, $this) + '> {' : 'class Request(\n' + it + '\n' + Spacer_instance.toString() + ') : Wirespec.Request<' + emit_4(_this__u8e3s4.a24_1, $this) + '> {';
+    return isBlank(it) ? 'object Request : Wirespec.Request<' + emit_3(_this__u8e3s4.a24_1, $this) + '> {' : 'class Request(\n' + it + '\n' + Spacer_instance.toString() + ') : Wirespec.Request<' + emit_3(_this__u8e3s4.a24_1, $this) + '> {';
   }
   function emitDeserializedParams_1(_this__u8e3s4, $this, endpoint) {
     // Inline function 'kotlin.let' call
@@ -1346,7 +1352,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitDeserializedParams.<anonymous>' call
-      tmp_3 = Spacer_instance.z23(3) + 'body = serialization.deserialize(requireNotNull(request.body) { "body is null" }, typeOf<' + emit_4(tmp0_safe_receiver, $this) + '>()),';
+      tmp_3 = Spacer_instance.z23(3) + 'body = serialization.deserialize(requireNotNull(request.body) { "body is null" }, typeOf<' + emit_3(tmp0_safe_receiver, $this) + '>()),';
     }
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitDeserializedParams.<anonymous>' call
@@ -1354,30 +1360,30 @@
     return isBlank(it) ? '' : '(\n' + it + '\n' + Spacer_instance.z23(2) + ')';
   }
   function emitSerialized_1(_this__u8e3s4, $this) {
-    return trimMargin('\n        |' + Spacer_instance.z23(3) + 'is Response' + _this__u8e3s4.v23_1 + ' -> Wirespec.RawResponse(\n        |' + Spacer_instance.z23(4) + 'statusCode = response.status,\n        |' + Spacer_instance.z23(4) + 'headers = mapOf(),\n        |' + Spacer_instance.z23(4) + 'body = ' + (!(_this__u8e3s4.x23_1 == null) ? 'serialization.serialize(response.body, typeOf<' + emit_4(_this__u8e3s4.x23_1, $this) + '>())' : 'null') + ',\n        |' + Spacer_instance.z23(3) + ')\n    ');
+    return trimMargin('\n        |' + Spacer_instance.z23(3) + 'is Response' + _this__u8e3s4.v23_1 + ' -> Wirespec.RawResponse(\n        |' + Spacer_instance.z23(4) + 'statusCode = response.status,\n        |' + Spacer_instance.z23(4) + 'headers = mapOf(),\n        |' + Spacer_instance.z23(4) + 'body = ' + (!(_this__u8e3s4.x23_1 == null) ? 'serialization.serialize(response.body, typeOf<' + emit_3(_this__u8e3s4.x23_1, $this) + '>())' : 'null') + ',\n        |' + Spacer_instance.z23(3) + ')\n    ');
   }
   function emitDeserialized_2(_this__u8e3s4, $this) {
-    return trimMargin('\n        |' + Spacer_instance.z23(3) + _this__u8e3s4.v23_1 + ' -> Response' + _this__u8e3s4.v23_1 + '(\n        |' + Spacer_instance.z23(4) + 'body = serialization.deserialize(requireNotNull(response.body) { "body is null" }, typeOf<' + emit_4(_this__u8e3s4.x23_1, $this) + '>()),\n        |' + Spacer_instance.z23(3) + ')\n    ');
+    return trimMargin('\n        |' + Spacer_instance.z23(3) + _this__u8e3s4.v23_1 + ' -> Response' + _this__u8e3s4.v23_1 + '(\n        |' + Spacer_instance.z23(4) + 'body = serialization.deserialize(requireNotNull(response.body) { "body is null" }, typeOf<' + emit_3(_this__u8e3s4.x23_1, $this) + '>()),\n        |' + Spacer_instance.z23(3) + ')\n    ');
   }
   function emitSerialized_2(_this__u8e3s4, $this, fields) {
-    return 'request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + '?.let{"' + _this__u8e3s4.i24_1.y22_1 + '" to serialization.serialize(it, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>())}';
+    return 'request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1) + '?.let{"' + _this__u8e3s4.i24_1.b1() + '" to serialization.serialize(it, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>())}';
   }
   function emitDeserialized_3(_this__u8e3s4, $this) {
-    return Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.pd_1.m24_1, Type_Field_getInstance()) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.od_1 + '], typeOf<' + $this.o24(_this__u8e3s4.pd_1.n24_1) + '>())';
+    return Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.pd_1.m24_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.od_1 + '], typeOf<' + $this.o24(_this__u8e3s4.pd_1.n24_1) + '>())';
   }
   function emitDeserialized_4(_this__u8e3s4, $this, fields) {
-    return _this__u8e3s4.k24_1 ? Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ' = request.' + fields + '["' + _this__u8e3s4.i24_1.y22_1 + '"]?.let{ serialization.deserialize(it, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>()) }' : Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ' = serialization.deserialize(requireNotNull(request.' + fields + '["' + _this__u8e3s4.i24_1.y22_1 + '"]) { "' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ' is null" }, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>())';
+    return _this__u8e3s4.k24_1 ? Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.i24_1) + ' = request.' + fields + '["' + _this__u8e3s4.i24_1.b1() + '"]?.let{ serialization.deserialize(it, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>()) }' : Spacer_instance.z23(3) + $this.l24(_this__u8e3s4.i24_1) + ' = serialization.deserialize(requireNotNull(request.' + fields + '["' + _this__u8e3s4.i24_1.b1() + '"]) { "' + $this.l24(_this__u8e3s4.i24_1) + ' is null" }, typeOf<' + $this.o24(_this__u8e3s4.j24_1) + '>())';
   }
   function emitIdentifier_0(_this__u8e3s4, $this) {
-    return 'request.path.' + $this.l24(_this__u8e3s4.m24_1, Type_Field_getInstance()) + '.let{serialization.serialize(it, typeOf<' + $this.o24(_this__u8e3s4.n24_1) + '>())}';
+    return 'request.path.' + $this.l24(_this__u8e3s4.m24_1) + '.let{serialization.serialize(it, typeOf<' + $this.o24(_this__u8e3s4.n24_1) + '>())}';
   }
-  function emit_4(_this__u8e3s4, $this) {
+  function emit_3(_this__u8e3s4, $this) {
     var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.c24_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.o24(tmp1_safe_receiver);
     return tmp2_elvis_lhs == null ? 'Unit' : tmp2_elvis_lhs;
   }
-  function emit_5(_this__u8e3s4, $this) {
-    return $this.l24(_this__u8e3s4.m24_1, Type_Field_getInstance()) + ': ' + $this.o24(_this__u8e3s4.n24_1);
+  function emit_4(_this__u8e3s4, $this) {
+    return $this.l24(_this__u8e3s4.m24_1) + ': ' + $this.o24(_this__u8e3s4.n24_1);
   }
   function brace(_this__u8e3s4, $this) {
     return wrap(_this__u8e3s4, $this, '(', ')');
@@ -1465,7 +1471,7 @@
   }
   function KotlinEmitter$emit$lambda_2(this$0) {
     return function (it) {
-      return emit_5(it, this$0);
+      return emit_4(it, this$0);
     };
   }
   function KotlinEmitter$emit$lambda_3(this$0) {
@@ -1511,17 +1517,17 @@
   }
   function KotlinEmitter$emit$lambda_9(this$0) {
     return function (it) {
-      return this$0.l24(it.m24_1, Type_Field_getInstance());
+      return this$0.l24(it.m24_1);
     };
   }
   function KotlinEmitter$emit$lambda_10(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1);
     };
   }
   function KotlinEmitter$emit$lambda_11(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1);
     };
   }
   function KotlinEmitter$emit$lambda_12(this$0) {
@@ -1551,7 +1557,7 @@
   }
   function KotlinEmitter$emitConstructor$lambda(this$0) {
     return function (it) {
-      return Spacer_instance.z23(2) + emit_5(it, this$0);
+      return Spacer_instance.z23(2) + emit_4(it, this$0);
     };
   }
   function KotlinEmitter$emitConstructor$lambda_0(this$0) {
@@ -1599,22 +1605,22 @@
   protoOf(KotlinEmitter).x24 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Endpoint) {
-      tmp = this.l24(_this__u8e3s4.n23_1, Type_Class_getInstance()) + 'Endpoint';
+      tmp = this.l24(_this__u8e3s4.n23_1) + 'Endpoint';
     } else {
       if (_this__u8e3s4 instanceof Channel) {
-        tmp = this.l24(_this__u8e3s4.f25_1, Type_Class_getInstance()) + 'Channel';
+        tmp = this.l24(_this__u8e3s4.f25_1) + 'Channel';
       } else {
         if (_this__u8e3s4 instanceof Enum_0) {
-          tmp = this.l24(_this__u8e3s4.c25_1, Type_Class_getInstance());
+          tmp = this.l24(_this__u8e3s4.c25_1);
         } else {
           if (_this__u8e3s4 instanceof Refined) {
-            tmp = this.l24(_this__u8e3s4.z24_1, Type_Class_getInstance());
+            tmp = this.l24(_this__u8e3s4.z24_1);
           } else {
-            if (_this__u8e3s4 instanceof Type_1) {
-              tmp = this.l24(_this__u8e3s4.a23_1, Type_Class_getInstance());
+            if (_this__u8e3s4 instanceof Type_0) {
+              tmp = this.l24(_this__u8e3s4.z22_1);
             } else {
               if (_this__u8e3s4 instanceof Union) {
-                tmp = this.l24(_this__u8e3s4.t22_1, Type_Class_getInstance());
+                tmp = this.l24(_this__u8e3s4.t22_1);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -1647,15 +1653,15 @@
   };
   protoOf(KotlinEmitter).l25 = function (type, ast) {
     var tmp;
-    if (type.b23_1.n25_1.l()) {
+    if (type.a23_1.n25_1.l()) {
       tmp = Spacer_instance.toString() + 'data object ' + this.x24(type);
     } else {
       var tmp_0 = this.x24(type);
-      var tmp_1 = this.m25(type.b23_1);
+      var tmp_1 = this.m25(type.a23_1);
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
-      var $this$run = type.c23_1;
+      var $this$run = type.b23_1;
       var tmp_2;
       if ($this$run.l()) {
         tmp_2 = '';
@@ -1671,7 +1677,7 @@
     return dropLast(joinToString(_this__u8e3s4.n25_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_0(this)), 1);
   };
   protoOf(KotlinEmitter).s24 = function (_this__u8e3s4) {
-    return this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ': ' + this.o24(_this__u8e3s4.j24_1) + (_this__u8e3s4.k24_1 ? '?' : '');
+    return this.l24(_this__u8e3s4.i24_1) + ': ' + this.o24(_this__u8e3s4.j24_1) + (_this__u8e3s4.k24_1 ? '?' : '');
   };
   protoOf(KotlinEmitter).o24 = function (_this__u8e3s4) {
     // Inline function 'kotlin.let' call
@@ -1720,39 +1726,37 @@
     var it_0 = _this__u8e3s4.e24() ? 'List<' + it + '>' : it;
     return _this__u8e3s4.q24() ? 'Map<String, ' + it_0 + '>' : it_0;
   };
-  protoOf(KotlinEmitter).l24 = function (_this__u8e3s4, type) {
+  protoOf(KotlinEmitter).l24 = function (identifier) {
     var tmp;
-    switch (type.q2_1) {
-      case 0:
-        tmp = Companion_getInstance_3().h24(sanitizeSymbol_0(_this__u8e3s4.y22_1, this));
-        break;
-      case 1:
-        tmp = sanitizeKeywords_0(Companion_getInstance_3().p24(sanitizeSymbol_0(_this__u8e3s4.y22_1, this)), this);
-        break;
-      default:
+    if (identifier instanceof DefinitionIdentifier) {
+      tmp = Companion_getInstance_3().h24(sanitizeSymbol_0(identifier.b1(), this));
+    } else {
+      if (identifier instanceof FieldIdentifier) {
+        tmp = sanitizeKeywords_0(Companion_getInstance_3().p24(sanitizeSymbol_0(identifier.b1(), this)), this);
+      } else {
         noWhenBranchMatchedException();
-        break;
+      }
     }
     return tmp;
   };
   protoOf(KotlinEmitter).o25 = function (refined) {
-    return trimMargin('\n        |data class ' + sanitizeSymbol_0(refined.z24_1.y22_1, this) + '(override val value: String): Wirespec.Refined {\n        |' + Spacer_instance.toString() + 'override fun toString() = value\n        |}\n        |\n        |fun ' + refined.z24_1.y22_1 + '.validate() = ' + this.p25(refined.a25_1) + '\n        |\n    ');
+    return trimMargin('\n        |data class ' + sanitizeSymbol_0(refined.z24_1.b1(), this) + '(override val value: String): Wirespec.Refined {\n        |' + Spacer_instance.toString() + 'override fun toString() = value\n        |}\n        |\n        |fun ' + refined.z24_1.b1() + '.validate() = ' + this.p25(refined.a25_1) + '\n        |\n    ');
   };
   protoOf(KotlinEmitter).p25 = function (_this__u8e3s4) {
     return 'Regex("""' + _this__u8e3s4.r25_1 + '""").matches(value)';
   };
   protoOf(KotlinEmitter).s25 = function (enum_0) {
-    var tmp = sanitizeSymbol_0(enum_0.c25_1.y22_1, this);
+    var tmp = sanitizeSymbol_0(enum_0.c25_1.b1(), this);
     return trimMargin('\n        |enum class ' + tmp + ' (override val label: String): Wirespec.Enum {\n        |' + this.t25(joinToString(enum_0.d25_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_1(this))) + ';\n        |' + Spacer_instance.toString() + 'override fun toString(): String {\n        |' + Spacer_instance.z23(2) + 'return label\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
   };
   protoOf(KotlinEmitter).u25 = function (union) {
     return trimMargin('\n        |sealed interface ' + this.x24(union) + '\n        |\n    ');
   };
   protoOf(KotlinEmitter).v25 = function (channel) {
-    return trimMargin('\n        |interface ' + this.l24(channel.f25_1, Type_Class_getInstance()) + 'Channel {\n        |   operator fun invoke(message: ' + emitWrap_0(channel.h25_1, this, channel.g25_1) + ')\n        |}\n        |\n    ');
+    return trimMargin('\n        |interface ' + this.l24(channel.f25_1) + 'Channel {\n        |   operator fun invoke(message: ' + emitWrap_0(channel.h25_1, this, channel.g25_1) + ')\n        |}\n        |\n    ');
   };
   protoOf(KotlinEmitter).w25 = function (endpoint) {
-    var tmp = this.l24(endpoint.n23_1, Type_Class_getInstance());
+    var tmp = this.l24(endpoint.n23_1);
     var tmp_0 = this.f24(endpoint);
     var tmp_1 = emitObject_0(tmp_0, this, 'Path', 'Wirespec.Path', KotlinEmitter$emit$lambda_2(this));
     var tmp_2 = emitObject_0(endpoint.q23_1, this, 'Queries', 'Wirespec.Queries', KotlinEmitter$emit$lambda_3(this));
@@ -1832,7 +1836,7 @@
     return trimMargin('\n        |object ' + tmp + 'Endpoint : Wirespec.Endpoint {\n        |' + tmp_1 + '\n        |\n        |' + tmp_2 + '\n        |\n        |' + tmp_3 + '\n        |\n        |' + tmp_4 + '\n        |\n        |' + tmp_5 + 'sealed interface Response<T: Any> : Wirespec.Response<T>\n        |\n        |' + tmp_6 + '\n        |\n        |' + tmp_7 + '\n        |\n        |' + tmp_9 + '\n        |\n        |' + tmp_10 + 'fun toResponse(serialization: Wirespec.Serializer<String>, response: Response<*>): Wirespec.RawResponse =\n        |' + tmp_11 + 'when(response) {\n        |' + tmp_13 + '\n        |' + tmp_14 + '}\n        |\n        |' + tmp_15 + 'fun fromResponse(serialization: Wirespec.Deserializer<String>, response: Wirespec.RawResponse): Response<*> =\n        |' + tmp_16 + 'when (response.statusCode) {\n        |' + tmp_18 + '\n        |' + tmp_19 + 'else -> error("Cannot match response with status: ${response.statusCode}")\n        |' + tmp_20 + '}\n        |\n        |' + tmp_21 + 'interface Handler: Wirespec.Handler {\n        |' + tmp_22 + tmp_23 + '\n        |' + tmp_24 + 'companion object: Wirespec.Server<Request, Response<*>>, Wirespec.Client<Request, Response<*>> {\n        |' + tmp_25 + 'override val pathTemplate = "/' + joinToString(endpoint.p23_1, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_8(this)) + '"\n        |' + Spacer_instance.z23(3) + 'override val method = "' + endpoint.o23_1.toString() + '"\n        |' + Spacer_instance.z23(3) + 'override fun server(serialization: Wirespec.Serialization<String>) = object : Wirespec.ServerEdge<Request, Response<*>> {\n        |' + Spacer_instance.z23(4) + 'override fun from(request: Wirespec.RawRequest) = fromRequest(serialization, request)\n        |' + Spacer_instance.z23(4) + 'override fun to(response: Response<*>) = toResponse(serialization, response)\n        |' + Spacer_instance.z23(3) + '}\n        |' + Spacer_instance.z23(3) + 'override fun client(serialization: Wirespec.Serialization<String>) = object : Wirespec.ClientEdge<Request, Response<*>> {\n        |' + Spacer_instance.z23(4) + 'override fun to(request: Request) = toRequest(serialization, request)\n        |' + Spacer_instance.z23(4) + 'override fun from(response: Wirespec.RawResponse) = fromResponse(serialization, response)\n        |' + Spacer_instance.z23(3) + '}\n        |' + Spacer_instance.z23(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
   };
   protoOf(KotlinEmitter).z25 = function (endpoint) {
-    return 'suspend fun ' + Companion_getInstance_3().p24(this.l24(endpoint.n23_1, Type_Class_getInstance())) + '(request: Request): Response<*>';
+    return 'suspend fun ' + Companion_getInstance_3().p24(this.l24(endpoint.n23_1)) + '(request: Request): Response<*>';
   };
   protoOf(KotlinEmitter).x25 = function (_this__u8e3s4, endpoint) {
     var tmp = Spacer_instance.toString();
@@ -1869,10 +1873,10 @@
     } else {
       tmp_20 = 'emptyMap()';
     }
-    return trimMargin('\n        |' + tmp + tmp_0 + '\n        |' + tmp_1 + 'override val path = Path' + tmp_3 + '\n        |' + tmp_4 + 'override val method = Wirespec.Method.' + endpoint.o23_1.p2_1 + '\n        |' + tmp_5 + 'override val queries = Queries' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = Headers' + tmp_8 + tmp_9 + '\n        |' + tmp_10 + '}\n        |\n        |' + tmp_11 + 'fun toRequest(serialization: Wirespec.Serializer<String>, request: Request): Wirespec.RawRequest =\n        |' + tmp_12 + 'Wirespec.RawRequest(\n        |' + tmp_13 + 'path = listOf(' + tmp_14 + '),\n        |' + tmp_15 + 'method = request.method.name,\n        |' + tmp_16 + 'queries = ' + tmp_18 + ',\n        |' + tmp_19 + 'headers = ' + tmp_20 + ',\n        |' + Spacer_instance.z23(3) + 'body = serialization.serialize(request.body, typeOf<' + emit_4(_this__u8e3s4.a24_1, this) + '>()),\n        |' + Spacer_instance.z23(2) + ')\n        |\n        |' + Spacer_instance.toString() + 'fun fromRequest(serialization: Wirespec.Deserializer<String>, request: Wirespec.RawRequest): Request =\n        |' + Spacer_instance.z23(2) + 'Request' + emitDeserializedParams_1(_this__u8e3s4, this, endpoint) + '\n    ');
+    return trimMargin('\n        |' + tmp + tmp_0 + '\n        |' + tmp_1 + 'override val path = Path' + tmp_3 + '\n        |' + tmp_4 + 'override val method = Wirespec.Method.' + endpoint.o23_1.p2_1 + '\n        |' + tmp_5 + 'override val queries = Queries' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = Headers' + tmp_8 + tmp_9 + '\n        |' + tmp_10 + '}\n        |\n        |' + tmp_11 + 'fun toRequest(serialization: Wirespec.Serializer<String>, request: Request): Wirespec.RawRequest =\n        |' + tmp_12 + 'Wirespec.RawRequest(\n        |' + tmp_13 + 'path = listOf(' + tmp_14 + '),\n        |' + tmp_15 + 'method = request.method.name,\n        |' + tmp_16 + 'queries = ' + tmp_18 + ',\n        |' + tmp_19 + 'headers = ' + tmp_20 + ',\n        |' + Spacer_instance.z23(3) + 'body = serialization.serialize(request.body, typeOf<' + emit_3(_this__u8e3s4.a24_1, this) + '>()),\n        |' + Spacer_instance.z23(2) + ')\n        |\n        |' + Spacer_instance.toString() + 'fun fromRequest(serialization: Wirespec.Deserializer<String>, request: Wirespec.RawRequest): Request =\n        |' + Spacer_instance.z23(2) + 'Request' + emitDeserializedParams_1(_this__u8e3s4, this, endpoint) + '\n    ');
   };
   protoOf(KotlinEmitter).t24 = function (_this__u8e3s4) {
-    return trimMargin('\n        |' + Spacer_instance.toString() + 'data class Response' + _this__u8e3s4.v23_1 + '(override val body: ' + emit_4(_this__u8e3s4.x23_1, this) + ') : Response' + toString_0(charSequenceGet(_this__u8e3s4.v23_1, 0)) + 'XX<' + emit_4(_this__u8e3s4.x23_1, this) + '>, Response' + concatGenerics(emit_4(_this__u8e3s4.x23_1, this)) + ' {\n        |' + Spacer_instance.z23(2) + 'override val status = ' + fixStatus_0(_this__u8e3s4.v23_1, this) + '\n        |' + Spacer_instance.z23(2) + 'override val headers = Headers\n        |' + Spacer_instance.z23(2) + 'data object Headers : Wirespec.Response.Headers\n        |' + Spacer_instance.toString() + '}\n    ');
+    return trimMargin('\n        |' + Spacer_instance.toString() + 'data class Response' + _this__u8e3s4.v23_1 + '(override val body: ' + emit_3(_this__u8e3s4.x23_1, this) + ') : Response' + toString_0(charSequenceGet(_this__u8e3s4.v23_1, 0)) + 'XX<' + emit_3(_this__u8e3s4.x23_1, this) + '>, Response' + concatGenerics(emit_3(_this__u8e3s4.x23_1, this)) + ' {\n        |' + Spacer_instance.z23(2) + 'override val status = ' + fixStatus_0(_this__u8e3s4.v23_1, this) + '\n        |' + Spacer_instance.z23(2) + 'override val headers = Headers\n        |' + Spacer_instance.z23(2) + 'data object Headers : Wirespec.Response.Headers\n        |' + Spacer_instance.toString() + '}\n    ');
   };
   function Companion_1() {
     Companion_instance_2 = this;
@@ -1901,7 +1905,7 @@
       var tmp = Spacer_instance.toString();
       // Inline function 'kotlin.text.uppercase' call
       // Inline function 'kotlin.js.asDynamic' call
-      return tmp + 'final case object ' + emit$_anonymous_$sanitize_964c6p(it).toUpperCase() + ' extends ' + this$0.l24($$this$run.c25_1, Type_Class_getInstance()) + '(label = "' + it + '")';
+      return tmp + 'final case object ' + emit$_anonymous_$sanitize_964c6p(it).toUpperCase() + ' extends ' + this$0.l24($$this$run.c25_1) + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter(packageName, logger) {
@@ -1918,22 +1922,22 @@
   protoOf(ScalaEmitter).x24 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Endpoint) {
-      tmp = this.l24(_this__u8e3s4.n23_1, Type_Class_getInstance()) + 'Endpoint';
+      tmp = this.l24(_this__u8e3s4.n23_1) + 'Endpoint';
     } else {
       if (_this__u8e3s4 instanceof Channel) {
-        tmp = this.l24(_this__u8e3s4.f25_1, Type_Class_getInstance()) + 'Channel';
+        tmp = this.l24(_this__u8e3s4.f25_1) + 'Channel';
       } else {
         if (_this__u8e3s4 instanceof Enum_0) {
-          tmp = this.l24(_this__u8e3s4.c25_1, Type_Class_getInstance());
+          tmp = this.l24(_this__u8e3s4.c25_1);
         } else {
           if (_this__u8e3s4 instanceof Refined) {
-            tmp = this.l24(_this__u8e3s4.z24_1, Type_Class_getInstance());
+            tmp = this.l24(_this__u8e3s4.z24_1);
           } else {
-            if (_this__u8e3s4 instanceof Type_1) {
-              tmp = this.l24(_this__u8e3s4.a23_1, Type_Class_getInstance());
+            if (_this__u8e3s4 instanceof Type_0) {
+              tmp = this.l24(_this__u8e3s4.z22_1);
             } else {
               if (_this__u8e3s4 instanceof Union) {
-                tmp = this.l24(_this__u8e3s4.t22_1, Type_Class_getInstance());
+                tmp = this.l24(_this__u8e3s4.t22_1);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -1967,16 +1971,19 @@
     return destination;
   };
   protoOf(ScalaEmitter).l25 = function (type, ast) {
-    return trimMargin('\n        |case class ' + this.x24(type) + '(\n        |' + this.m25(type.b23_1) + '\n        |)\n        |\n    ');
+    return trimMargin('\n        |case class ' + this.x24(type) + '(\n        |' + this.m25(type.a23_1) + '\n        |)\n        |\n    ');
   };
   protoOf(ScalaEmitter).m25 = function (_this__u8e3s4) {
     return dropLast(joinToString(_this__u8e3s4.n25_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda(this)), 1);
   };
   protoOf(ScalaEmitter).s24 = function (_this__u8e3s4) {
-    return Spacer_instance.toString() + 'val ' + this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ': ' + (_this__u8e3s4.k24_1 ? 'Option[' + this.o24(_this__u8e3s4.j24_1) + ']' : this.o24(_this__u8e3s4.j24_1)) + ',';
+    return Spacer_instance.toString() + 'val ' + this.l24(_this__u8e3s4.i24_1) + ': ' + (_this__u8e3s4.k24_1 ? 'Option[' + this.o24(_this__u8e3s4.j24_1) + ']' : this.o24(_this__u8e3s4.j24_1)) + ',';
   };
-  protoOf(ScalaEmitter).l24 = function (_this__u8e3s4, type) {
-    return Companion_getInstance_1().g26_1.p1(_this__u8e3s4.y22_1) ? addBackticks(_this__u8e3s4.y22_1) : _this__u8e3s4.y22_1;
+  protoOf(ScalaEmitter).l24 = function (identifier) {
+    // Inline function 'kotlin.run' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
+    return Companion_getInstance_1().g26_1.p1(identifier.b1()) ? addBackticks(identifier.b1()) : identifier.b1();
   };
   protoOf(ScalaEmitter).v25 = function (channel) {
     return this.l26();
@@ -2033,7 +2040,7 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
     var tmp = this.x24(enum_0);
-    var tmp_0 = this.l24(enum_0.c25_1, Type_Class_getInstance());
+    var tmp_0 = this.l24(enum_0.c25_1);
     return trimMargin('\n        |sealed abstract class ' + tmp + '(val label: String)\n        |object ' + tmp_0 + ' {\n        |' + joinToString(enum_0.d25_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda_0(this, enum_0)) + '\n        |}\n        |');
   };
   protoOf(ScalaEmitter).o25 = function (refined) {
@@ -2165,8 +2172,8 @@
   function joinToObject(_this__u8e3s4, $this, transform) {
     return joinToString(_this__u8e3s4, ', ', '{', '}', VOID, VOID, transform);
   }
-  function emit_6(_this__u8e3s4, $this) {
-    return $this.l24(_this__u8e3s4.r26_1, Type_Field_getInstance()) + (_this__u8e3s4.t26_1 ? '?' : '') + ': ' + $this.o24(_this__u8e3s4.s26_1);
+  function emit_5(_this__u8e3s4, $this) {
+    return $this.l24(_this__u8e3s4.r26_1) + (_this__u8e3s4.t26_1 ? '?' : '') + ': ' + $this.o24(_this__u8e3s4.s26_1);
   }
   function emitName(_this__u8e3s4, $this) {
     return 'Response' + Companion_getInstance_3().h24(_this__u8e3s4.v23_1);
@@ -2185,7 +2192,7 @@
     return trimIndent('\n      |' + tmp + 'export type ' + tmp_0 + ' = { \n      |' + tmp_1 + 'status: ' + _this__u8e3s4.v23_1 + '\n      |' + tmp_2 + 'headers: {' + joinToString(_this__u8e3s4.w23_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda_0($this)) + '}\n      |' + Spacer_instance.z23(2) + 'body: ' + emitReference_0(_this__u8e3s4, $this) + '\n      |' + Spacer_instance.toString() + '}\n    ');
   }
   function sanitizeSymbol_1(_this__u8e3s4, $this) {
-    return sanitizeSymbol_2(_this__u8e3s4.y22_1, $this);
+    return sanitizeSymbol_2(_this__u8e3s4.b1(), $this);
   }
   function sanitizeSymbol_2(_this__u8e3s4, $this) {
     var tmp = asSequence(_this__u8e3s4);
@@ -2195,7 +2202,7 @@
     return trimMargin('\n        |export const client: Wirespec.Client<Request, Response> = (serialization: Wirespec.Serialization) => ({\n        |' + prependIndent(emitClientTo(_this__u8e3s4, $this), Spacer_instance.z23(1)) + ',\n        |' + prependIndent(emitClientFrom(_this__u8e3s4, $this), Spacer_instance.z23(1)) + '\n        |})\n    ');
   }
   function emitPathArray(_this__u8e3s4, $this) {
-    return joinToString(_this__u8e3s4.p23_1, ', ', '[', ']', VOID, VOID, TypeScriptEmitter$emitPathArray$lambda);
+    return joinToString(_this__u8e3s4.p23_1, ', ', '[', ']', VOID, VOID, TypeScriptEmitter$emitPathArray$lambda($this));
   }
   function emitClientTo(_this__u8e3s4, $this) {
     var tmp = Spacer_instance.z23(1);
@@ -2239,13 +2246,13 @@
     return trimMargin('\n        |to: (response) => ({\n        |' + Spacer_instance.z23(1) + 'status: response.status,\n        |' + Spacer_instance.z23(1) + 'headers: {},\n        |' + Spacer_instance.z23(1) + 'body: serialization.serialize(response.body),\n        |})\n    ');
   }
   function emitDeserialize(_this__u8e3s4, $this) {
-    return $this.l24(_this__u8e3s4.pd_1.m24_1, Type_Field_getInstance()) + ': serialization.deserialize(request.path[' + _this__u8e3s4.od_1 + '])';
+    return $this.l24(_this__u8e3s4.pd_1.m24_1) + ': serialization.deserialize(request.path[' + _this__u8e3s4.od_1 + '])';
   }
   function emitDeserialize_0(_this__u8e3s4, $this, fields) {
-    return $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ': serialization.deserialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ')';
+    return $this.l24(_this__u8e3s4.i24_1) + ': serialization.deserialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1) + ')';
   }
   function emitSerialize(_this__u8e3s4, $this, fields) {
-    return $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ': serialization.serialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ')';
+    return $this.l24(_this__u8e3s4.i24_1) + ': serialization.serialize(request.' + fields + '.' + $this.l24(_this__u8e3s4.i24_1) + ')';
   }
   function TypeScriptEmitter$emit$lambda(it) {
     return '"' + it + '"';
@@ -2297,32 +2304,32 @@
   }
   function TypeScriptEmitter$emitFunction$lambda(this$0) {
     return function (it) {
-      return emit_6(it, this$0);
+      return emit_5(it, this$0);
     };
   }
   function TypeScriptEmitter$emitFunction$lambda_0(this$0) {
     return function (it) {
-      return this$0.l24(it.m24_1, Type_Field_getInstance()) + ': props.' + this$0.l24(it.m24_1, Type_Field_getInstance());
+      return this$0.l24(it.m24_1) + ': props.' + this$0.l24(it.m24_1);
     };
   }
   function TypeScriptEmitter$emitFunction$lambda_1(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance()) + ': props.' + this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1) + ': props.' + this$0.l24(it.i24_1);
     };
   }
   function TypeScriptEmitter$emitFunction$lambda_2(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance()) + ': props.' + this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1) + ': props.' + this$0.l24(it.i24_1);
     };
   }
   function TypeScriptEmitter$emitFunction$lambda_3(this$0) {
     return function (it) {
-      return emit_6(it, this$0);
+      return emit_5(it, this$0);
     };
   }
   function TypeScriptEmitter$emitFunction$lambda_4(this$0) {
     return function (it) {
-      return this$0.l24(it.i24_1, Type_Field_getInstance()) + ': props.' + this$0.l24(it.i24_1, Type_Field_getInstance());
+      return this$0.l24(it.i24_1) + ': props.' + this$0.l24(it.i24_1);
     };
   }
   function TypeScriptEmitter$emitType$lambda_0(this$0) {
@@ -2333,18 +2340,20 @@
   function TypeScriptEmitter$sanitizeSymbol$lambda(it) {
     return isLetterOrDigit(it.x_1) || listOf_0(new Char(_Char___init__impl__6a9atx(95))).p1(it);
   }
-  function TypeScriptEmitter$emitPathArray$lambda(it) {
-    var tmp;
-    if (it instanceof Literal) {
-      tmp = '"' + it.v24_1 + '"';
-    } else {
-      if (it instanceof Param_0) {
-        tmp = 'serialization.serialize(request.path.' + it.m24_1.toString() + ')';
+  function TypeScriptEmitter$emitPathArray$lambda(this$0) {
+    return function (it) {
+      var tmp;
+      if (it instanceof Literal) {
+        tmp = '"' + it.v24_1 + '"';
       } else {
-        noWhenBranchMatchedException();
+        if (it instanceof Param_0) {
+          tmp = 'serialization.serialize(request.path.' + this$0.l24(it.m24_1) + ')';
+        } else {
+          noWhenBranchMatchedException();
+        }
       }
-    }
-    return tmp;
+      return tmp;
+    };
   }
   function TypeScriptEmitter$emitClientTo$lambda(this$0) {
     return function (it) {
@@ -2383,22 +2392,22 @@
   protoOf(TypeScriptEmitter).x24 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Endpoint) {
-      tmp = this.l24(_this__u8e3s4.n23_1, Type_Class_getInstance());
+      tmp = this.l24(_this__u8e3s4.n23_1);
     } else {
       if (_this__u8e3s4 instanceof Enum_0) {
-        tmp = this.l24(_this__u8e3s4.c25_1, Type_Class_getInstance());
+        tmp = this.l24(_this__u8e3s4.c25_1);
       } else {
         if (_this__u8e3s4 instanceof Refined) {
-          tmp = this.l24(_this__u8e3s4.z24_1, Type_Class_getInstance());
+          tmp = this.l24(_this__u8e3s4.z24_1);
         } else {
-          if (_this__u8e3s4 instanceof Type_1) {
-            tmp = this.l24(_this__u8e3s4.a23_1, Type_Class_getInstance());
+          if (_this__u8e3s4 instanceof Type_0) {
+            tmp = this.l24(_this__u8e3s4.z22_1);
           } else {
             if (_this__u8e3s4 instanceof Union) {
-              tmp = this.l24(_this__u8e3s4.t22_1, Type_Class_getInstance());
+              tmp = this.l24(_this__u8e3s4.t22_1);
             } else {
               if (_this__u8e3s4 instanceof Channel) {
-                tmp = this.l24(_this__u8e3s4.f25_1, Type_Class_getInstance());
+                tmp = this.l24(_this__u8e3s4.f25_1);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -2431,7 +2440,7 @@
     return destination;
   };
   protoOf(TypeScriptEmitter).l25 = function (type, ast) {
-    return trimMargin('export type ' + sanitizeSymbol_1(type.a23_1, this) + ' = {\n            |' + this.m25(type.b23_1) + '\n            |}\n            |\n            |');
+    return trimMargin('export type ' + sanitizeSymbol_1(type.z22_1, this) + ' = {\n            |' + this.m25(type.a23_1) + '\n            |}\n            |\n            |');
   };
   protoOf(TypeScriptEmitter).s25 = function (enum_0) {
     var tmp = sanitizeSymbol_1(enum_0.c25_1, this);
@@ -2441,10 +2450,10 @@
     return joinToString(_this__u8e3s4.n25_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0(this));
   };
   protoOf(TypeScriptEmitter).u26 = function (_this__u8e3s4) {
-    return Spacer_instance.toString() + '"' + this.l24(_this__u8e3s4.m24_1, Type_Field_getInstance()) + '": ' + this.o24(_this__u8e3s4.n24_1);
+    return Spacer_instance.toString() + '"' + this.l24(_this__u8e3s4.m24_1) + '": ' + this.o24(_this__u8e3s4.n24_1);
   };
   protoOf(TypeScriptEmitter).s24 = function (_this__u8e3s4) {
-    return Spacer_instance.toString() + '"' + this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + '"' + (_this__u8e3s4.k24_1 ? '?' : '') + ': ' + this.o24(_this__u8e3s4.j24_1);
+    return Spacer_instance.toString() + '"' + this.l24(_this__u8e3s4.i24_1) + '"' + (_this__u8e3s4.k24_1 ? '?' : '') + ': ' + this.o24(_this__u8e3s4.j24_1);
   };
   protoOf(TypeScriptEmitter).o24 = function (_this__u8e3s4) {
     // Inline function 'kotlin.let' call
@@ -2494,7 +2503,7 @@
     return _this__u8e3s4.q24() ? 'Record<string, ' + it_0 + '>' : it_0;
   };
   protoOf(TypeScriptEmitter).o25 = function (refined) {
-    return trimMargin('export type ' + sanitizeSymbol_1(refined.z24_1, this) + ' = string;\n            |const regExp' + this.l24(refined.z24_1, Type_Class_getInstance()) + ' = ' + this.p25(refined.a25_1) + ';\n            |export const validate' + this.l24(refined.z24_1, Type_Class_getInstance()) + ' = (value: string): value is ' + sanitizeSymbol_1(refined.z24_1, this) + ' => \n            |' + Spacer_instance.toString() + 'regExp' + this.l24(refined.z24_1, Type_Class_getInstance()) + '.test(value);\n            |');
+    return trimMargin('export type ' + sanitizeSymbol_1(refined.z24_1, this) + ' = string;\n            |const regExp' + this.l24(refined.z24_1) + ' = ' + this.p25(refined.a25_1) + ';\n            |export const validate' + this.l24(refined.z24_1) + ' = (value: string): value is ' + sanitizeSymbol_1(refined.z24_1, this) + ' => \n            |' + Spacer_instance.toString() + 'regExp' + this.l24(refined.z24_1) + '.test(value);\n            |');
   };
   protoOf(TypeScriptEmitter).p25 = function (_this__u8e3s4) {
     return _this__u8e3s4.q25_1;
@@ -2518,6 +2527,9 @@
     var tmp = sanitizeSymbol_1(union.t22_1, this);
     return 'export type ' + tmp + ' = ' + joinToString(union.u22_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_7(this)) + '\n';
   };
+  protoOf(TypeScriptEmitter).l24 = function (identifier) {
+    return identifier.b1();
+  };
   protoOf(TypeScriptEmitter).v25 = function (channel) {
     return this.l26();
   };
@@ -2644,7 +2656,7 @@
     return function (it) {
       var tmp;
       if (it instanceof Param_0) {
-        tmp = '{' + it.m24_1.y22_1 + ': ' + this$0.o24(it.n24_1) + '}';
+        tmp = '{' + it.m24_1.b1() + ': ' + this$0.o24(it.n24_1) + '}';
       } else {
         if (it instanceof Literal) {
           tmp = it.v24_1;
@@ -2668,22 +2680,22 @@
   protoOf(WirespecEmitter).x24 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Endpoint) {
-      tmp = this.l24(_this__u8e3s4.n23_1, Type_Class_getInstance());
+      tmp = this.l24(_this__u8e3s4.n23_1);
     } else {
       if (_this__u8e3s4 instanceof Enum_0) {
-        tmp = this.l24(_this__u8e3s4.c25_1, Type_Class_getInstance());
+        tmp = this.l24(_this__u8e3s4.c25_1);
       } else {
         if (_this__u8e3s4 instanceof Refined) {
-          tmp = this.l24(_this__u8e3s4.z24_1, Type_Class_getInstance());
+          tmp = this.l24(_this__u8e3s4.z24_1);
         } else {
-          if (_this__u8e3s4 instanceof Type_1) {
-            tmp = this.l24(_this__u8e3s4.a23_1, Type_Class_getInstance());
+          if (_this__u8e3s4 instanceof Type_0) {
+            tmp = this.l24(_this__u8e3s4.z22_1);
           } else {
             if (_this__u8e3s4 instanceof Union) {
-              tmp = this.l24(_this__u8e3s4.t22_1, Type_Class_getInstance());
+              tmp = this.l24(_this__u8e3s4.t22_1);
             } else {
               if (_this__u8e3s4 instanceof Channel) {
-                tmp = this.l24(_this__u8e3s4.f25_1, Type_Class_getInstance());
+                tmp = this.l24(_this__u8e3s4.f25_1);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -2695,19 +2707,22 @@
     return tmp;
   };
   protoOf(WirespecEmitter).l25 = function (type, ast) {
-    return trimMargin('\n        |type ' + this.l24(type.a23_1, Type_Class_getInstance()) + ' {\n        |' + this.m25(type.b23_1) + '\n        |}\n        |');
+    return trimMargin('\n        |type ' + this.l24(type.z22_1) + ' {\n        |' + this.m25(type.a23_1) + '\n        |}\n        |');
   };
   protoOf(WirespecEmitter).m25 = function (_this__u8e3s4) {
     return joinToString(_this__u8e3s4.n25_1, ',\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda(this));
   };
   protoOf(WirespecEmitter).s24 = function (_this__u8e3s4) {
-    return this.l24(_this__u8e3s4.i24_1, Type_Field_getInstance()) + ': ' + this.o24(_this__u8e3s4.j24_1) + (_this__u8e3s4.k24_1 ? '?' : '');
+    return this.l24(_this__u8e3s4.i24_1) + ': ' + this.o24(_this__u8e3s4.j24_1) + (_this__u8e3s4.k24_1 ? '?' : '');
   };
-  protoOf(WirespecEmitter).l24 = function (_this__u8e3s4, type) {
-    return Companion_getInstance_2().a27_1.p1(_this__u8e3s4.y22_1) ? addBackticks(_this__u8e3s4.y22_1) : _this__u8e3s4.y22_1;
+  protoOf(WirespecEmitter).l24 = function (identifier) {
+    // Inline function 'kotlin.run' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>' call
+    return Companion_getInstance_2().a27_1.p1(identifier.b1()) ? addBackticks(identifier.b1()) : identifier.b1();
   };
   protoOf(WirespecEmitter).v25 = function (channel) {
-    return 'channel ' + this.l24(channel.f25_1, Type_Class_getInstance()) + ' -> ' + this.o24(channel.h25_1);
+    return 'channel ' + this.l24(channel.f25_1) + ' -> ' + this.o24(channel.h25_1);
   };
   protoOf(WirespecEmitter).o24 = function (_this__u8e3s4) {
     // Inline function 'kotlin.let' call
@@ -2757,18 +2772,18 @@
     return _this__u8e3s4.q24() ? '{ ' + it_0 + ' }' : it_0;
   };
   protoOf(WirespecEmitter).s25 = function (enum_0) {
-    var tmp = this.l24(enum_0.c25_1, Type_Class_getInstance());
+    var tmp = this.l24(enum_0.c25_1);
     var tmp_0 = Spacer_instance.toString();
     return 'enum ' + tmp + ' {\n' + tmp_0 + joinToString(enum_0.d25_1, ', ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_0(this)) + '\n}\n';
   };
   protoOf(WirespecEmitter).o25 = function (refined) {
-    return 'type ' + this.l24(refined.z24_1, Type_Class_getInstance()) + ' ' + this.p25(refined.a25_1) + '\n';
+    return 'type ' + this.l24(refined.z24_1) + ' ' + this.p25(refined.a25_1) + '\n';
   };
   protoOf(WirespecEmitter).p25 = function (_this__u8e3s4) {
     return _this__u8e3s4.q25_1;
   };
   protoOf(WirespecEmitter).w25 = function (endpoint) {
-    var tmp = this.l24(endpoint.n23_1, Type_Class_getInstance());
+    var tmp = this.l24(endpoint.n23_1);
     var tmp_0 = endpoint.o23_1.toString();
     var tmp_1 = emitRequest(endpoint.t23_1, this);
     var tmp_2 = emitPath(endpoint.p23_1, this);
@@ -2776,7 +2791,7 @@
     return trimMargin('\n        |endpoint ' + tmp + ' ' + tmp_0 + tmp_1 + ' ' + tmp_2 + tmp_3 + ' -> {\n        |' + joinToString(endpoint.u23_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_1(this)) + '\n        |}\n        |\n    ');
   };
   protoOf(WirespecEmitter).u25 = function (union) {
-    var tmp = this.l24(union.t22_1, Type_Class_getInstance());
+    var tmp = this.l24(union.t22_1);
     return 'type ' + tmp + ' = ' + joinToString(union.u22_1, ' | ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_2(this)) + '\n';
   };
   function Spacer() {
@@ -2873,11 +2888,11 @@
     this.t26_1 = isNullable;
   }
   protoOf(Param).toString = function () {
-    return 'Param(type=' + this.q26_1.toString() + ', identifier=' + this.r26_1.toString() + ', reference=' + toString(this.s26_1) + ', isNullable=' + this.t26_1 + ')';
+    return 'Param(type=' + this.q26_1.toString() + ', identifier=' + toString(this.r26_1) + ', reference=' + toString(this.s26_1) + ', isNullable=' + this.t26_1 + ')';
   };
   protoOf(Param).hashCode = function () {
     var result = this.q26_1.hashCode();
-    result = imul(result, 31) + this.r26_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.r26_1) | 0;
     result = imul(result, 31) + hashCode(this.s26_1) | 0;
     result = imul(result, 31) + getBooleanHashCode(this.t26_1) | 0;
     return result;
@@ -2890,7 +2905,7 @@
     var tmp0_other_with_cast = other instanceof Param ? other : THROW_CCE();
     if (!this.q26_1.equals(tmp0_other_with_cast.q26_1))
       return false;
-    if (!this.r26_1.equals(tmp0_other_with_cast.r26_1))
+    if (!equals(this.r26_1, tmp0_other_with_cast.r26_1))
       return false;
     if (!equals(this.s26_1, tmp0_other_with_cast.s26_1))
       return false;
@@ -2902,7 +2917,7 @@
     return new Param(ParamType_PATH_getInstance(), _this__u8e3s4.m24_1, _this__u8e3s4.n24_1, false);
   }
   function toParam_0(_this__u8e3s4, $this) {
-    return new Param(ParamType_BODY_getInstance(), Companion_instance_6.b27('body'), _this__u8e3s4.c24_1, _this__u8e3s4.d24_1);
+    return new Param(ParamType_BODY_getInstance(), new FieldIdentifier('body'), _this__u8e3s4.c24_1, _this__u8e3s4.d24_1);
   }
   function toParam_1(_this__u8e3s4, $this, type) {
     return new Param(type, _this__u8e3s4.i24_1, _this__u8e3s4.j24_1, _this__u8e3s4.k24_1);
@@ -3073,7 +3088,7 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
       this.n22_1.d22('Emitting Node ' + toString(item));
       var tmp;
-      if (item instanceof Type_1) {
+      if (item instanceof Type_0) {
         tmp = new Emitted(this.x24(item), this.l25(item, ast));
       } else {
         if (item instanceof Endpoint) {
@@ -3125,7 +3140,7 @@
       tmp = _this__u8e3s4.v24_1;
     } else {
       if (_this__u8e3s4 instanceof Param_0) {
-        tmp = '{' + _this__u8e3s4.m24_1.y22_1 + '}';
+        tmp = '{' + _this__u8e3s4.m24_1.b1() + '}';
       } else {
         noWhenBranchMatchedException();
       }
@@ -3236,8 +3251,6 @@
     var tmp0_safe_receiver = _this__u8e3s4.x23_1;
     return flatten(listOf([tmp, listOfNotNull_0(tmp0_safe_receiver == null ? null : toParam_0(tmp0_safe_receiver, this))]));
   };
-  function IdentifierEmitter() {
-  }
   function TypeScriptShared() {
     TypeScriptShared_instance = this;
     this.v26_1 = 'community.flock.wirespec';
@@ -3274,7 +3287,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.e27_1, '' + expected.k9() + ' expected, not: ' + name(actual.d27_1) + ' at line ' + actual.e27_1.f27_1 + ' and position ' + (actual.e27_1.g27_1 - actual.c27_1.length | 0));
+    ParserException.call(this, actual.d27_1, '' + expected.k9() + ' expected, not: ' + name(actual.c27_1) + ' at line ' + actual.d27_1.e27_1 + ' and position ' + (actual.d27_1.f27_1 - actual.b27_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function DefinitionNotExistsException(referenceName, coordinates) {
@@ -3296,7 +3309,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.i27_1 = coordinates;
+    this.h27_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     return _this__u8e3s4;
@@ -3312,60 +3325,60 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Arrow)
-        raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Arrow)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(Colon), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_0 = true;
       } else {
         tmp_0 = false;
       }
       var isDict = tmp_0;
-      var type = _this__u8e3s4.l27_1.d27_1;
+      var type = _this__u8e3s4.k27_1.c27_1;
       var tmp_1;
       if (isInterface(type, WirespecType)) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.with' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-        var $this$with = $this.q27_1;
-        var tmp2_reference = raise.qk($this$with.s27(_this__u8e3s4, type, _this__u8e3s4.l27_1.c27_1, isDict));
+        var $this$with = $this.p27_1;
+        var tmp2_reference = raise.qk($this$with.r27(_this__u8e3s4, type, _this__u8e3s4.k27_1.b27_1, isDict));
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.l27_1.d27_1;
+        var tmp_2 = _this__u8e3s4.k27_1.c27_1;
         var this_1 = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
         if (this_1)
-          raise.qk(_this__u8e3s4.o27());
+          raise.qk(_this__u8e3s4.n27());
         var this_2 = new Channel(comment, identifier, this_1, tmp2_reference);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
         if (isDict) {
-          if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-            raise.qk(_this__u8e3s4.o27());
+          if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+            raise.qk(_this__u8e3s4.n27());
           else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual_0 = _this__u8e3s4.l27_1;
+            var actual_0 = _this__u8e3s4.k27_1;
             var this_3 = new WrongTokenException(getKClass(RightCurly), actual_0);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_3);
           }
         }
@@ -3373,11 +3386,11 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = _this__u8e3s4.l27_1;
+        var actual_1 = _this__u8e3s4.k27_1;
         var this_4 = new WrongTokenException(getKClass(CustomType), actual_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_4);
       }
       var res = tmp_1;
@@ -3407,9 +3420,9 @@
   }
   function ChannelParser(logger) {
     AbstractParser.call(this, logger);
-    this.q27_1 = new TypeParser(logger);
+    this.p27_1 = new TypeParser(logger);
   }
-  protoOf(ChannelParser).t27 = function (_this__u8e3s4, comment) {
+  protoOf(ChannelParser).s27 = function (_this__u8e3s4, comment) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -3420,19 +3433,19 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannel.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
-        tmp_0 = raise.qk(parseChannelDefinition(_this__u8e3s4, this, comment, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1)));
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
+        tmp_0 = raise.qk(parseChannelDefinition(_this__u8e3s4, this, comment, new DefinitionIdentifier(_this__u8e3s4.k27_1.b27_1)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(CustomType), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannel.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var res = tmp_0;
@@ -3471,29 +3484,29 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Method_0) {
-        tmp_0 = valueOf(_this__u8e3s4.l27_1.c27_1);
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Method_0) {
+        tmp_0 = valueOf(_this__u8e3s4.k27_1.b27_1);
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var tmp$ret$0 = new WrongTokenException(getKClass(Method_0), actual);
         raise.pk(tmp$ret$0);
       }
       var this_0 = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
       var method = this_0;
       var tmp_1;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_1 = true;
       } else {
         tmp_1 = false;
@@ -3501,11 +3514,11 @@
       var isDict = tmp_1;
       // Inline function 'kotlin.collections.map' call
       // Inline function 'kotlin.also' call
-      var tmp2_subject = _this__u8e3s4.l27_1.d27_1;
+      var tmp2_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_2;
       if (isInterface(tmp2_subject, WirespecType)) {
-        var tmp_3 = _this__u8e3s4.l27_1.d27_1;
-        tmp_2 = raise.qk(parseReference(_this__u8e3s4, $this, isInterface(tmp_3, WirespecType) ? tmp_3 : THROW_CCE(), _this__u8e3s4.l27_1.c27_1, isDict));
+        var tmp_3 = _this__u8e3s4.k27_1.c27_1;
+        tmp_2 = raise.qk(parseReference(_this__u8e3s4, $this, isInterface(tmp_3, WirespecType) ? tmp_3 : THROW_CCE(), _this__u8e3s4.k27_1.b27_1, isDict));
       } else {
         tmp_2 = null;
       }
@@ -3513,16 +3526,16 @@
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
       if (isDict) {
-        if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-          raise.qk(_this__u8e3s4.o27());
+        if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+          raise.qk(_this__u8e3s4.n27());
         else {
           // Inline function 'kotlin.also' call
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_0 = _this__u8e3s4.l27_1;
+          var actual_0 = _this__u8e3s4.k27_1;
           var this_2 = new WrongTokenException(getKClass(RightCurly), actual_0);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>.<anonymous>' call
-          raise.qk(_this__u8e3s4.o27());
+          raise.qk(_this__u8e3s4.n27());
           raise.pk(this_2);
         }
       }
@@ -3553,15 +3566,15 @@
       $l$loop: while (true) {
         var tmp_5;
         var tmp_6;
-        var tmp_7 = _this__u8e3s4.l27_1.d27_1;
+        var tmp_7 = _this__u8e3s4.k27_1.c27_1;
         if (!(tmp_7 instanceof QuestionMark)) {
-          var tmp_8 = _this__u8e3s4.l27_1.d27_1;
+          var tmp_8 = _this__u8e3s4.k27_1.c27_1;
           tmp_6 = !(tmp_8 instanceof Hash);
         } else {
           tmp_6 = false;
         }
         if (tmp_6) {
-          var tmp_9 = _this__u8e3s4.l27_1.d27_1;
+          var tmp_9 = _this__u8e3s4.k27_1.c27_1;
           tmp_5 = !(tmp_9 instanceof Arrow);
         } else {
           tmp_5 = false;
@@ -3573,18 +3586,18 @@
       }
       var segments = this_3;
       var tmp_10;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof QuestionMark) {
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof QuestionMark) {
+        raise.qk(_this__u8e3s4.n27());
         var tmp_11;
-        if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          var $this$with = $this.x27_1;
-          tmp_11 = raise.qk($this$with.y27(_this__u8e3s4)).n25_1;
+          var $this$with = $this.w27_1;
+          tmp_11 = raise.qk($this$with.x27(_this__u8e3s4)).n25_1;
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_1 = _this__u8e3s4.l27_1;
+          var actual_1 = _this__u8e3s4.k27_1;
           var tmp$ret$15 = new WrongTokenException(getKClass(LeftCurly), actual_1);
           raise.pk(tmp$ret$15);
         }
@@ -3594,18 +3607,18 @@
       }
       var queryParams = tmp_10;
       var tmp_12;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Hash) {
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Hash) {
+        raise.qk(_this__u8e3s4.n27());
         var tmp_13;
-        if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          var $this$with_0 = $this.x27_1;
-          tmp_13 = raise.qk($this$with_0.y27(_this__u8e3s4)).n25_1;
+          var $this$with_0 = $this.w27_1;
+          tmp_13 = raise.qk($this$with_0.x27(_this__u8e3s4)).n25_1;
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_2 = _this__u8e3s4.l27_1;
+          var actual_2 = _this__u8e3s4.k27_1;
           var tmp$ret$18 = new WrongTokenException(getKClass(LeftCurly), actual_2);
           raise.pk(tmp$ret$18);
         }
@@ -3614,24 +3627,24 @@
         tmp_12 = emptyList();
       }
       var headers = tmp_12;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Arrow)
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Arrow)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_3 = _this__u8e3s4.l27_1;
+        var actual_3 = _this__u8e3s4.k27_1;
         var tmp$ret$19 = new WrongTokenException(getKClass(Arrow), actual_3);
         raise.pk(tmp$ret$19);
       }
       // Inline function 'kotlin.also' call
-      if (!(_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly)) {
+      if (!(_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly)) {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_4 = _this__u8e3s4.l27_1;
+        var actual_4 = _this__u8e3s4.k27_1;
         var tmp$ret$20 = new WrongTokenException(getKClass(LeftCurly), actual_4);
         raise.pk(tmp$ret$20);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
       var responses = raise.qk(parseEndpointResponses(_this__u8e3s4, $this));
       var res = new Endpoint(comment, name, method, segments, queryParams, headers, emptyList(), requests, responses);
       raise.nk();
@@ -3669,22 +3682,22 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>' call
-      $this.v27(_this__u8e3s4.l27_1);
-      var tmp0_subject = _this__u8e3s4.l27_1.d27_1;
+      $this.u27(_this__u8e3s4.k27_1);
+      var tmp0_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_0;
       if (tmp0_subject instanceof Path) {
         // Inline function 'kotlin.also' call
-        var this_0 = new Literal(drop(_this__u8e3s4.l27_1.c27_1, 1));
+        var this_0 = new Literal(drop(_this__u8e3s4.k27_1.b27_1, 1));
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_0 = this_0;
       } else {
         if (tmp0_subject instanceof ForwardSlash) {
           tmp_0 = raise.qk(parseEndpointSegmentParam(_this__u8e3s4, $this));
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.l27_1;
+          var actual = _this__u8e3s4.k27_1;
           var tmp$ret$1 = new WrongTokenException(getKClass(Path), actual);
           raise.pk(tmp$ret$1);
         }
@@ -3725,59 +3738,59 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly)
-        raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var tmp$ret$0 = new WrongTokenException(getKClass(LeftCurly), actual);
         raise.pk(tmp$ret$0);
       }
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomValue) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomValue) {
         // Inline function 'kotlin.also' call
-        var this_0 = Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1);
+        var this_0 = new FieldIdentifier(_this__u8e3s4.k27_1.b27_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_0 = this_0;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var tmp$ret$2 = new WrongTokenException(getKClass(CustomValue), actual_0);
         raise.pk(tmp$ret$2);
       }
       var identifier = tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Colon)
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Colon)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = _this__u8e3s4.l27_1;
+        var actual_1 = _this__u8e3s4.k27_1;
         var tmp$ret$3 = new WrongTokenException(getKClass(Colon), actual_1);
         raise.pk(tmp$ret$3);
       }
       var tmp_1;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_1 = true;
       } else {
         tmp_1 = false;
       }
       var isDict = tmp_1;
       // Inline function 'kotlin.also' call
-      var tmp4_subject = _this__u8e3s4.l27_1.d27_1;
+      var tmp4_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_2;
       if (isInterface(tmp4_subject, WirespecType)) {
-        var tmp_3 = _this__u8e3s4.l27_1.d27_1;
-        tmp_2 = raise.qk(parseReference(_this__u8e3s4, $this, isInterface(tmp_3, WirespecType) ? tmp_3 : THROW_CCE(), _this__u8e3s4.l27_1.c27_1, isDict));
+        var tmp_3 = _this__u8e3s4.k27_1.c27_1;
+        tmp_2 = raise.qk(parseReference(_this__u8e3s4, $this, isInterface(tmp_3, WirespecType) ? tmp_3 : THROW_CCE(), _this__u8e3s4.k27_1.b27_1, isDict));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_2 = _this__u8e3s4.l27_1;
+        var actual_2 = _this__u8e3s4.k27_1;
         var tmp$ret$5 = new WrongTokenException(getKClass(WirespecType), actual_2);
         raise.pk(tmp$ret$5);
       }
@@ -3785,25 +3798,25 @@
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
       if (isDict) {
-        if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-          raise.qk(_this__u8e3s4.o27());
+        if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+          raise.qk(_this__u8e3s4.n27());
         else {
           // Inline function 'kotlin.also' call
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_3 = _this__u8e3s4.l27_1;
+          var actual_3 = _this__u8e3s4.k27_1;
           var this_2 = new WrongTokenException(getKClass(RightCurly), actual_3);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>.<anonymous>' call
-          raise.qk(_this__u8e3s4.o27());
+          raise.qk(_this__u8e3s4.n27());
           raise.pk(this_2);
         }
       }
       var reference = this_1;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_4 = _this__u8e3s4.l27_1;
+        var actual_4 = _this__u8e3s4.k27_1;
         var tmp$ret$9 = new WrongTokenException(getKClass(RightCurly), actual_4);
         raise.pk(tmp$ret$9);
       }
@@ -3843,33 +3856,33 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>' call
-      $this.v27(_this__u8e3s4.l27_1);
+      $this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.collections.mutableListOf' call
       var responses = ArrayList_init_$Create$();
       $l$loop: while (true) {
-        var tmp_0 = _this__u8e3s4.l27_1.d27_1;
+        var tmp_0 = _this__u8e3s4.k27_1.c27_1;
         if (!!(tmp_0 instanceof RightCurly)) {
           break $l$loop;
         }
-        if (_this__u8e3s4.l27_1.d27_1 instanceof StatusCode)
-          responses.e(raise.qk(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.l27_1.c27_1)));
+        if (_this__u8e3s4.k27_1.c27_1 instanceof StatusCode)
+          responses.e(raise.qk(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.k27_1.b27_1)));
         else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.l27_1;
+          var actual = _this__u8e3s4.k27_1;
           var tmp$ret$1 = new WrongTokenException(getKClass(StatusCode), actual);
           raise.pk(tmp$ret$1);
         }
       }
       // Inline function 'kotlin.also' call
-      if (!(_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)) {
+      if (!(_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)) {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var tmp$ret$2 = new WrongTokenException(getKClass(RightCurly), actual_0);
         raise.pk(tmp$ret$2);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
       var res = toList(responses);
       raise.nk();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -3906,36 +3919,36 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
-      if (!(_this__u8e3s4.l27_1.d27_1 instanceof Arrow)) {
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
+      if (!(_this__u8e3s4.k27_1.c27_1 instanceof Arrow)) {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var tmp$ret$0 = new WrongTokenException(getKClass(Arrow), actual);
         raise.pk(tmp$ret$0);
       }
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_0 = true;
       } else {
         tmp_0 = false;
       }
       var isDict = tmp_0;
       // Inline function 'kotlin.also' call
-      var tmp2_subject = _this__u8e3s4.l27_1.d27_1;
+      var tmp2_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_1;
       if (isInterface(tmp2_subject, WirespecType)) {
-        var tmp_2 = _this__u8e3s4.l27_1.d27_1;
-        tmp_1 = raise.qk(parseContent(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.l27_1.c27_1, isDict));
+        var tmp_2 = _this__u8e3s4.k27_1.c27_1;
+        tmp_1 = raise.qk(parseContent(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.k27_1.b27_1, isDict));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var tmp$ret$2 = new WrongTokenException(getKClass(WirespecType), actual_0);
         raise.pk(tmp$ret$2);
       }
@@ -3943,16 +3956,16 @@
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>.<anonymous>' call
       if (isDict) {
-        if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-          raise.qk(_this__u8e3s4.o27());
+        if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+          raise.qk(_this__u8e3s4.n27());
         else {
           // Inline function 'kotlin.also' call
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual_1 = _this__u8e3s4.l27_1;
+          var actual_1 = _this__u8e3s4.k27_1;
           var this_1 = new WrongTokenException(getKClass(RightCurly), actual_1);
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>.<anonymous>.<anonymous>' call
-          raise.qk(_this__u8e3s4.o27());
+          raise.qk(_this__u8e3s4.n27());
           raise.pk(this_1);
         }
       }
@@ -3993,7 +4006,7 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>' call
-      $this.v27(_this__u8e3s4.l27_1);
+      $this.u27(_this__u8e3s4.k27_1);
       var reference = raise.qk(parseReference(_this__u8e3s4, $this, wsType, value, isDict));
       var tmp_0;
       if (reference instanceof Unit) {
@@ -4037,16 +4050,16 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>' call
-      var previousToken = _this__u8e3s4.l27_1;
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      var previousToken = _this__u8e3s4.k27_1;
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.l27_1.d27_1;
+      var tmp_0 = _this__u8e3s4.k27_1.c27_1;
       var this_0 = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>.<anonymous>' call
       if (this_0)
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
       var isIterable = this_0;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -4065,7 +4078,7 @@
                 tmp_1 = new Unit(isIterable);
               } else {
                 if (wsType instanceof CustomType) {
-                  raise.qk(_this__u8e3s4.z27(previousToken));
+                  raise.qk(_this__u8e3s4.y27(previousToken));
                   tmp_1 = new Custom(value, isIterable);
                 } else {
                   noWhenBranchMatchedException();
@@ -4102,9 +4115,9 @@
   }
   function EndpointParser(logger) {
     AbstractParser.call(this, logger);
-    this.x27_1 = new TypeParser(logger);
+    this.w27_1 = new TypeParser(logger);
   }
-  protoOf(EndpointParser).a28 = function (_this__u8e3s4, comment) {
+  protoOf(EndpointParser).z27 = function (_this__u8e3s4, comment) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4115,19 +4128,19 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
-        tmp_0 = raise.qk(parseEndpointDefinition(_this__u8e3s4, this, comment, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1)));
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
+        tmp_0 = raise.qk(parseEndpointDefinition(_this__u8e3s4, this, comment, new DefinitionIdentifier(_this__u8e3s4.k27_1.b27_1)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(CustomType), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var res = tmp_0;
@@ -4166,35 +4179,35 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         tmp_0 = new Enum_0(comment, typeName, raise.qk(parseEnumTypeEntries(_this__u8e3s4, $this)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(LeftCurly), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var this_1 = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var this_2 = new WrongTokenException(getKClass(RightCurly), actual_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_2);
       }
       var res = this_1;
@@ -4233,33 +4246,33 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var this_0 = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        this_0.e(_this__u8e3s4.l27_1.c27_1);
-        raise.qk(_this__u8e3s4.o27());
-        while (equals(_this__u8e3s4.l27_1.d27_1, Comma_instance)) {
-          raise.qk(_this__u8e3s4.o27());
-          if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
+        this_0.e(_this__u8e3s4.k27_1.b27_1);
+        raise.qk(_this__u8e3s4.n27());
+        while (equals(_this__u8e3s4.k27_1.c27_1, Comma_instance)) {
+          raise.qk(_this__u8e3s4.n27());
+          if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
             // Inline function 'kotlin.also' call
-            this_0.e(_this__u8e3s4.l27_1.c27_1);
+            this_0.e(_this__u8e3s4.k27_1.b27_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = _this__u8e3s4.l27_1;
+            var actual = _this__u8e3s4.k27_1;
             var this_1 = new WrongTokenException(getKClass(CustomType), actual);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_1);
           }
         }
@@ -4267,11 +4280,11 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var this_2 = new WrongTokenException(getKClass(CustomType), actual_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_2);
       }
       var res = toSet(tmp_0);
@@ -4302,7 +4315,7 @@
   function EnumParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(EnumParser).c28 = function (_this__u8e3s4, comment) {
+  protoOf(EnumParser).b28 = function (_this__u8e3s4, comment) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4313,19 +4326,19 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
-        tmp_0 = raise.qk(parseEnumTypeDefinition(_this__u8e3s4, this, comment, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1)));
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
+        tmp_0 = raise.qk(parseEnumTypeDefinition(_this__u8e3s4, this, comment, new DefinitionIdentifier(_this__u8e3s4.k27_1.b27_1)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(CustomType), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var res = tmp_0;
@@ -4370,141 +4383,93 @@
   function Comment__equals_impl_3xkmkx($this, other) {
     if (!(other instanceof Comment))
       return false;
-    if (!($this === (other instanceof Comment ? other.e28_1 : THROW_CCE())))
+    if (!($this === (other instanceof Comment ? other.d28_1 : THROW_CCE())))
       return false;
     return true;
   }
   function Comment(value) {
-    this.e28_1 = value;
+    this.d28_1 = value;
   }
   protoOf(Comment).b1 = function () {
-    return _Comment___get_value__impl__8r3pla(this.e28_1);
+    return _Comment___get_value__impl__8r3pla(this.d28_1);
   };
   protoOf(Comment).toString = function () {
-    return Comment__toString_impl_803gny(this.e28_1);
+    return Comment__toString_impl_803gny(this.d28_1);
   };
   protoOf(Comment).hashCode = function () {
-    return Comment__hashCode_impl_tr9dgt(this.e28_1);
+    return Comment__hashCode_impl_tr9dgt(this.d28_1);
   };
   protoOf(Comment).equals = function (other) {
-    return Comment__equals_impl_3xkmkx(this.e28_1, other);
+    return Comment__equals_impl_3xkmkx(this.d28_1, other);
   };
-  var Type_Class_instance;
-  var Type_Field_instance;
-  var Type_entriesInitialized;
-  function Type_initEntries() {
-    if (Type_entriesInitialized)
-      return Unit_instance;
-    Type_entriesInitialized = true;
-    Type_Class_instance = new Type('Class', 0);
-    Type_Field_instance = new Type('Field', 1);
-  }
-  function Type(name, ordinal) {
-    Enum.call(this, name, ordinal);
-  }
-  function Companion_5() {
-  }
-  protoOf(Companion_5).b27 = function (value) {
-    // Inline function 'kotlin.let' call
-    // Inline function 'kotlin.contracts.contract' call
-    var p0 = removeBackticks(value);
-    return new Identifier(p0);
-  };
-  var Companion_instance_6;
-  function Companion_getInstance_5() {
-    return Companion_instance_6;
-  }
-  function Type_Class_getInstance() {
-    Type_initEntries();
-    return Type_Class_instance;
-  }
-  function Type_Field_getInstance() {
-    Type_initEntries();
-    return Type_Field_instance;
-  }
-  function Identifier(value) {
-    this.y22_1 = value;
+  function Identifier(name) {
+    this.c23_1 = removeBackticks(name);
   }
   protoOf(Identifier).b1 = function () {
-    return this.y22_1;
-  };
-  protoOf(Identifier).toString = function () {
-    return this.y22_1;
-  };
-  protoOf(Identifier).equals = function (other) {
-    if (this === other)
-      return true;
-    if (other == null || !getKClassFromExpression(this).equals(getKClassFromExpression(other)))
-      return false;
-    if (!(other instanceof Identifier))
-      THROW_CCE();
-    return this.y22_1 === other.y22_1;
-  };
-  protoOf(Identifier).hashCode = function () {
-    return getStringHashCode(this.y22_1);
+    return this.c23_1;
   };
   var Type_String_instance;
   var Type_Integer_instance;
   var Type_Number_instance;
   var Type_Boolean_instance;
-  var Type_entriesInitialized_0;
-  function Type_initEntries_0() {
-    if (Type_entriesInitialized_0)
+  var Type_entriesInitialized;
+  function Type_initEntries() {
+    if (Type_entriesInitialized)
       return Unit_instance;
-    Type_entriesInitialized_0 = true;
-    Type_String_instance = new Type_0('String', 0);
-    Type_Integer_instance = new Type_0('Integer', 1);
-    Type_Number_instance = new Type_0('Number', 2);
-    Type_Boolean_instance = new Type_0('Boolean', 3);
+    Type_entriesInitialized = true;
+    Type_String_instance = new Type('String', 0);
+    Type_Integer_instance = new Type('Integer', 1);
+    Type_Number_instance = new Type('Number', 2);
+    Type_Boolean_instance = new Type('Boolean', 3);
   }
-  function Type_0(name, ordinal) {
+  function Type(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
   function Type_String_getInstance() {
-    Type_initEntries_0();
+    Type_initEntries();
     return Type_String_instance;
   }
   function Type_Integer_getInstance() {
-    Type_initEntries_0();
+    Type_initEntries();
     return Type_Integer_instance;
   }
   function Type_Number_getInstance() {
-    Type_initEntries_0();
+    Type_initEntries();
     return Type_Number_instance;
   }
   function Type_Boolean_getInstance() {
-    Type_initEntries_0();
+    Type_initEntries();
     return Type_Boolean_instance;
   }
   function Any(isIterable, isDictionary) {
     isDictionary = isDictionary === VOID ? false : isDictionary;
-    this.f28_1 = isIterable;
-    this.g28_1 = isDictionary;
-    this.h28_1 = 'Any';
+    this.e28_1 = isIterable;
+    this.f28_1 = isDictionary;
+    this.g28_1 = 'Any';
   }
   protoOf(Any).e24 = function () {
-    return this.f28_1;
+    return this.e28_1;
   };
   protoOf(Any).q24 = function () {
-    return this.g28_1;
+    return this.f28_1;
   };
   protoOf(Any).b1 = function () {
-    return this.h28_1;
+    return this.g28_1;
   };
-  protoOf(Any).i28 = function (isIterable, isDictionary) {
+  protoOf(Any).h28 = function (isIterable, isDictionary) {
     return new Any(isIterable, isDictionary);
   };
-  protoOf(Any).j28 = function (isIterable, isDictionary, $super) {
-    isIterable = isIterable === VOID ? this.f28_1 : isIterable;
-    isDictionary = isDictionary === VOID ? this.g28_1 : isDictionary;
-    return $super === VOID ? this.i28(isIterable, isDictionary) : $super.i28.call(this, isIterable, isDictionary);
+  protoOf(Any).i28 = function (isIterable, isDictionary, $super) {
+    isIterable = isIterable === VOID ? this.e28_1 : isIterable;
+    isDictionary = isDictionary === VOID ? this.f28_1 : isDictionary;
+    return $super === VOID ? this.h28(isIterable, isDictionary) : $super.h28.call(this, isIterable, isDictionary);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.f28_1 + ', isDictionary=' + this.g28_1 + ')';
+    return 'Any(isIterable=' + this.e28_1 + ', isDictionary=' + this.f28_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = getBooleanHashCode(this.f28_1);
-    result = imul(result, 31) + getBooleanHashCode(this.g28_1) | 0;
+    var result = getBooleanHashCode(this.e28_1);
+    result = imul(result, 31) + getBooleanHashCode(this.f28_1) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -4513,41 +4478,41 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.f28_1 === tmp0_other_with_cast.f28_1))
+    if (!(this.e28_1 === tmp0_other_with_cast.e28_1))
       return false;
-    if (!(this.g28_1 === tmp0_other_with_cast.g28_1))
+    if (!(this.f28_1 === tmp0_other_with_cast.f28_1))
       return false;
     return true;
   };
   function Unit(isIterable, isDictionary) {
     isDictionary = isDictionary === VOID ? false : isDictionary;
-    this.k28_1 = isIterable;
-    this.l28_1 = isDictionary;
-    this.m28_1 = 'Unit';
+    this.j28_1 = isIterable;
+    this.k28_1 = isDictionary;
+    this.l28_1 = 'Unit';
   }
   protoOf(Unit).e24 = function () {
-    return this.k28_1;
+    return this.j28_1;
   };
   protoOf(Unit).q24 = function () {
-    return this.l28_1;
+    return this.k28_1;
   };
   protoOf(Unit).b1 = function () {
-    return this.m28_1;
+    return this.l28_1;
   };
-  protoOf(Unit).i28 = function (isIterable, isDictionary) {
+  protoOf(Unit).h28 = function (isIterable, isDictionary) {
     return new Unit(isIterable, isDictionary);
   };
-  protoOf(Unit).n28 = function (isIterable, isDictionary, $super) {
-    isIterable = isIterable === VOID ? this.k28_1 : isIterable;
-    isDictionary = isDictionary === VOID ? this.l28_1 : isDictionary;
-    return $super === VOID ? this.i28(isIterable, isDictionary) : $super.i28.call(this, isIterable, isDictionary);
+  protoOf(Unit).m28 = function (isIterable, isDictionary, $super) {
+    isIterable = isIterable === VOID ? this.j28_1 : isIterable;
+    isDictionary = isDictionary === VOID ? this.k28_1 : isDictionary;
+    return $super === VOID ? this.h28(isIterable, isDictionary) : $super.h28.call(this, isIterable, isDictionary);
   };
   protoOf(Unit).toString = function () {
-    return 'Unit(isIterable=' + this.k28_1 + ', isDictionary=' + this.l28_1 + ')';
+    return 'Unit(isIterable=' + this.j28_1 + ', isDictionary=' + this.k28_1 + ')';
   };
   protoOf(Unit).hashCode = function () {
-    var result = getBooleanHashCode(this.k28_1);
-    result = imul(result, 31) + getBooleanHashCode(this.l28_1) | 0;
+    var result = getBooleanHashCode(this.j28_1);
+    result = imul(result, 31) + getBooleanHashCode(this.k28_1) | 0;
     return result;
   };
   protoOf(Unit).equals = function (other) {
@@ -4556,9 +4521,9 @@
     if (!(other instanceof Unit))
       return false;
     var tmp0_other_with_cast = other instanceof Unit ? other : THROW_CCE();
-    if (!(this.k28_1 === tmp0_other_with_cast.k28_1))
+    if (!(this.j28_1 === tmp0_other_with_cast.j28_1))
       return false;
-    if (!(this.l28_1 === tmp0_other_with_cast.l28_1))
+    if (!(this.k28_1 === tmp0_other_with_cast.k28_1))
       return false;
     return true;
   };
@@ -4577,14 +4542,14 @@
   protoOf(Custom).q24 = function () {
     return this.x22_1;
   };
-  protoOf(Custom).o28 = function (value, isIterable, isDictionary) {
+  protoOf(Custom).n28 = function (value, isIterable, isDictionary) {
     return new Custom(value, isIterable, isDictionary);
   };
-  protoOf(Custom).p28 = function (value, isIterable, isDictionary, $super) {
+  protoOf(Custom).o28 = function (value, isIterable, isDictionary, $super) {
     value = value === VOID ? this.v22_1 : value;
     isIterable = isIterable === VOID ? this.w22_1 : isIterable;
     isDictionary = isDictionary === VOID ? this.x22_1 : isDictionary;
-    return $super === VOID ? this.o28(value, isIterable, isDictionary) : $super.o28.call(this, value, isIterable, isDictionary);
+    return $super === VOID ? this.n28(value, isIterable, isDictionary) : $super.n28.call(this, value, isIterable, isDictionary);
   };
   protoOf(Custom).toString = function () {
     return 'Custom(value=' + this.v22_1 + ', isIterable=' + this.w22_1 + ', isDictionary=' + this.x22_1 + ')';
@@ -4626,14 +4591,14 @@
   protoOf(Primitive).b1 = function () {
     return this.l23_1;
   };
-  protoOf(Primitive).q28 = function (type, isIterable, isDictionary) {
+  protoOf(Primitive).p28 = function (type, isIterable, isDictionary) {
     return new Primitive(type, isIterable, isDictionary);
   };
-  protoOf(Primitive).r28 = function (type, isIterable, isDictionary, $super) {
+  protoOf(Primitive).q28 = function (type, isIterable, isDictionary, $super) {
     type = type === VOID ? this.i23_1 : type;
     isIterable = isIterable === VOID ? this.j23_1 : isIterable;
     isDictionary = isDictionary === VOID ? this.k23_1 : isDictionary;
-    return $super === VOID ? this.q28(type, isIterable, isDictionary) : $super.q28.call(this, type, isIterable, isDictionary);
+    return $super === VOID ? this.p28(type, isIterable, isDictionary) : $super.p28.call(this, type, isIterable, isDictionary);
   };
   protoOf(Primitive).toString = function () {
     return 'Primitive(type=' + this.i23_1.toString() + ', isIterable=' + this.j23_1 + ', isDictionary=' + this.k23_1 + ')';
@@ -4680,67 +4645,67 @@
       return false;
     return true;
   };
-  function Type_1(comment, identifier, shape, extends_0) {
-    this.z22_1 = comment;
-    this.a23_1 = identifier;
-    this.b23_1 = shape;
-    this.c23_1 = extends_0;
+  function Type_0(comment, identifier, shape, extends_0) {
+    this.y22_1 = comment;
+    this.z22_1 = identifier;
+    this.a23_1 = shape;
+    this.b23_1 = extends_0;
   }
-  protoOf(Type_1).d28 = function () {
-    return this.a23_1;
+  protoOf(Type_0).c28 = function () {
+    return this.z22_1;
   };
-  protoOf(Type_1).s28 = function (comment, identifier, shape, extends_0) {
-    return new Type_1(comment, identifier, shape, extends_0);
+  protoOf(Type_0).r28 = function (comment, identifier, shape, extends_0) {
+    return new Type_0(comment, identifier, shape, extends_0);
   };
-  protoOf(Type_1).t28 = function (comment, identifier, shape, extends_0, $super) {
-    comment = comment === VOID ? this.z22_1 : comment;
-    identifier = identifier === VOID ? this.a23_1 : identifier;
-    shape = shape === VOID ? this.b23_1 : shape;
-    extends_0 = extends_0 === VOID ? this.c23_1 : extends_0;
+  protoOf(Type_0).s28 = function (comment, identifier, shape, extends_0, $super) {
+    comment = comment === VOID ? this.y22_1 : comment;
+    identifier = identifier === VOID ? this.z22_1 : identifier;
+    shape = shape === VOID ? this.a23_1 : shape;
+    extends_0 = extends_0 === VOID ? this.b23_1 : extends_0;
     var tmp;
     if ($super === VOID) {
-      tmp = this.s28(comment, identifier, shape, extends_0);
+      tmp = this.r28(comment, identifier, shape, extends_0);
     } else {
-      var tmp_0 = $super.s28;
+      var tmp_0 = $super.r28;
       var tmp_1 = comment;
       tmp = tmp_0.call(this, tmp_1 == null ? null : new Comment(tmp_1), identifier, shape, extends_0);
     }
     return tmp;
   };
-  protoOf(Type_1).toString = function () {
-    var tmp = this.z22_1;
-    return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.a23_1.toString() + ', shape=' + this.b23_1.toString() + ', extends=' + toString(this.c23_1) + ')';
+  protoOf(Type_0).toString = function () {
+    var tmp = this.y22_1;
+    return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.z22_1.toString() + ', shape=' + this.a23_1.toString() + ', extends=' + toString(this.b23_1) + ')';
   };
-  protoOf(Type_1).hashCode = function () {
+  protoOf(Type_0).hashCode = function () {
     var tmp;
-    var tmp_0 = this.z22_1;
+    var tmp_0 = this.y22_1;
     if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
       tmp = 0;
     } else {
-      tmp = Comment__hashCode_impl_tr9dgt(this.z22_1);
+      tmp = Comment__hashCode_impl_tr9dgt(this.y22_1);
     }
     var result = tmp;
+    result = imul(result, 31) + this.z22_1.hashCode() | 0;
     result = imul(result, 31) + this.a23_1.hashCode() | 0;
-    result = imul(result, 31) + this.b23_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.c23_1) | 0;
+    result = imul(result, 31) + hashCode(this.b23_1) | 0;
     return result;
   };
-  protoOf(Type_1).equals = function (other) {
+  protoOf(Type_0).equals = function (other) {
     if (this === other)
       return true;
-    if (!(other instanceof Type_1))
+    if (!(other instanceof Type_0))
       return false;
-    var tmp0_other_with_cast = other instanceof Type_1 ? other : THROW_CCE();
-    var tmp = this.z22_1;
+    var tmp0_other_with_cast = other instanceof Type_0 ? other : THROW_CCE();
+    var tmp = this.y22_1;
     var tmp_0 = tmp == null ? null : new Comment(tmp);
-    var tmp_1 = tmp0_other_with_cast.z22_1;
+    var tmp_1 = tmp0_other_with_cast.y22_1;
     if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
       return false;
-    if (!this.a23_1.equals(tmp0_other_with_cast.a23_1))
+    if (!this.z22_1.equals(tmp0_other_with_cast.z22_1))
       return false;
-    if (!this.b23_1.equals(tmp0_other_with_cast.b23_1))
+    if (!this.a23_1.equals(tmp0_other_with_cast.a23_1))
       return false;
-    if (!equals(this.c23_1, tmp0_other_with_cast.c23_1))
+    if (!equals(this.b23_1, tmp0_other_with_cast.b23_1))
       return false;
     return true;
   };
@@ -4967,7 +4932,7 @@
     this.t23_1 = requests;
     this.u23_1 = responses;
   }
-  protoOf(Endpoint).d28 = function () {
+  protoOf(Endpoint).c28 = function () {
     return this.n23_1;
   };
   protoOf(Endpoint).toString = function () {
@@ -5027,7 +4992,7 @@
     this.c25_1 = identifier;
     this.d25_1 = entries;
   }
-  protoOf(Enum_0).d28 = function () {
+  protoOf(Enum_0).c28 = function () {
     return this.c25_1;
   };
   protoOf(Enum_0).toString = function () {
@@ -5092,7 +5057,7 @@
     this.z24_1 = identifier;
     this.a25_1 = validator;
   }
-  protoOf(Refined).d28 = function () {
+  protoOf(Refined).c28 = function () {
     return this.z24_1;
   };
   protoOf(Refined).toString = function () {
@@ -5134,7 +5099,7 @@
     this.t22_1 = identifier;
     this.u22_1 = entries;
   }
-  protoOf(Union).d28 = function () {
+  protoOf(Union).c28 = function () {
     return this.t22_1;
   };
   protoOf(Union).toString = function () {
@@ -5177,7 +5142,7 @@
     this.g25_1 = isNullable;
     this.h25_1 = reference;
   }
-  protoOf(Channel).d28 = function () {
+  protoOf(Channel).c28 = function () {
     return this.f25_1;
   };
   protoOf(Channel).toString = function () {
@@ -5217,6 +5182,26 @@
       return false;
     return true;
   };
+  function FieldIdentifier(name) {
+    Identifier.call(this, name);
+    this.u28_1 = name;
+  }
+  protoOf(FieldIdentifier).toString = function () {
+    return 'FieldIdentifier(name=' + this.u28_1 + ')';
+  };
+  protoOf(FieldIdentifier).hashCode = function () {
+    return getStringHashCode(this.u28_1);
+  };
+  protoOf(FieldIdentifier).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof FieldIdentifier))
+      return false;
+    var tmp0_other_with_cast = other instanceof FieldIdentifier ? other : THROW_CCE();
+    if (!(this.u28_1 === tmp0_other_with_cast.u28_1))
+      return false;
+    return true;
+  };
   function Field(identifier, reference, isNullable) {
     this.i24_1 = identifier;
     this.j24_1 = reference;
@@ -5245,6 +5230,26 @@
       return false;
     return true;
   };
+  function DefinitionIdentifier(name) {
+    Identifier.call(this, name);
+    this.w28_1 = name;
+  }
+  protoOf(DefinitionIdentifier).toString = function () {
+    return 'DefinitionIdentifier(name=' + this.w28_1 + ')';
+  };
+  protoOf(DefinitionIdentifier).hashCode = function () {
+    return getStringHashCode(this.w28_1);
+  };
+  protoOf(DefinitionIdentifier).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof DefinitionIdentifier))
+      return false;
+    var tmp0_other_with_cast = other instanceof DefinitionIdentifier ? other : THROW_CCE();
+    if (!(this.w28_1 === tmp0_other_with_cast.w28_1))
+      return false;
+    return true;
+  };
   function parse_0(_this__u8e3s4, $this) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
@@ -5333,52 +5338,52 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      $this.v27(_this__u8e3s4.l27_1);
+      $this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof WsComment) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof WsComment) {
         // Inline function 'kotlin.also' call
-        var this_0 = new Comment(_Comment___init__impl__cg8s2u(_this__u8e3s4.l27_1.c27_1));
+        var this_0 = new Comment(_Comment___init__impl__cg8s2u(_this__u8e3s4.k27_1.b27_1));
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        this_0.e28_1;
-        raise.qk(_this__u8e3s4.o27());
-        tmp_0 = this_0.e28_1;
+        this_0.d28_1;
+        raise.qk(_this__u8e3s4.n27());
+        tmp_0 = this_0.d28_1;
       } else {
         tmp_0 = null;
       }
       var comment = tmp_0;
-      var tmp1_subject = _this__u8e3s4.l27_1.d27_1;
+      var tmp1_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_1;
       if (isInterface(tmp1_subject, WirespecDefinition)) {
-        var tmp_2 = _this__u8e3s4.l27_1.d27_1;
+        var tmp_2 = _this__u8e3s4.k27_1.c27_1;
         var tmp2_subject = isInterface(tmp_2, WirespecDefinition) ? tmp_2 : THROW_CCE();
         var tmp_3;
         if (tmp2_subject instanceof WsTypeDef) {
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-          var tmp$ret$2 = $this.i22_1.u28(_this__u8e3s4, comment);
+          var tmp$ret$2 = $this.i22_1.x28(_this__u8e3s4, comment);
           tmp_3 = raise.qk(tmp$ret$2);
         } else {
           if (tmp2_subject instanceof WsEnumTypeDef) {
             // Inline function 'kotlin.with' call
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            var tmp$ret$4 = $this.j22_1.c28(_this__u8e3s4, comment);
+            var tmp$ret$4 = $this.j22_1.b28(_this__u8e3s4, comment);
             tmp_3 = raise.qk(tmp$ret$4);
           } else {
             if (tmp2_subject instanceof WsEndpointDef) {
               // Inline function 'kotlin.with' call
               // Inline function 'kotlin.contracts.contract' call
               // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-              var tmp$ret$6 = $this.k22_1.a28(_this__u8e3s4, comment);
+              var tmp$ret$6 = $this.k22_1.z27(_this__u8e3s4, comment);
               tmp_3 = raise.qk(tmp$ret$6);
             } else {
               if (tmp2_subject instanceof WsChannelDef) {
                 // Inline function 'kotlin.with' call
                 // Inline function 'kotlin.contracts.contract' call
                 // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-                var tmp$ret$8 = $this.l22_1.t27(_this__u8e3s4, comment);
+                var tmp$ret$8 = $this.l22_1.s27(_this__u8e3s4, comment);
                 tmp_3 = raise.qk(tmp$ret$8);
               } else {
                 noWhenBranchMatchedException();
@@ -5390,11 +5395,11 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_1 = new WrongTokenException(getKClass(WirespecDefinition), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_1);
       }
       var res = tmp_1;
@@ -5430,13 +5435,13 @@
     this.l22_1 = new ChannelParser(logger);
   }
   protoOf(Parser).m22 = function (tokens) {
-    return parse_0(toProvider(removeWhiteSpace(tokens), this.u27_1), this);
+    return parse_0(toProvider(removeWhiteSpace(tokens), this.t27_1), this);
   };
   function AbstractParser(logger) {
-    this.u27_1 = logger;
+    this.t27_1 = logger;
   }
-  protoOf(AbstractParser).v27 = function (_this__u8e3s4) {
-    return this.u27_1.d22('Parsing ' + toString(_this__u8e3s4.d27_1) + ' at line ' + _this__u8e3s4.e27_1.f27_1 + ' position ' + _this__u8e3s4.e27_1.g27_1);
+  protoOf(AbstractParser).u27 = function (_this__u8e3s4) {
+    return this.t27_1.d22('Parsing ' + toString(_this__u8e3s4.c27_1) + ' at line ' + _this__u8e3s4.d27_1.e27_1 + ' position ' + _this__u8e3s4.d27_1.f27_1);
   };
   function printTokens($this, previousToken) {
     var tmp;
@@ -5446,15 +5451,15 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp = "Eating: '" + previousToken.c27_1 + "', ";
+      tmp = "Eating: '" + previousToken.b27_1 + "', ";
     }
     var tmp1_elvis_lhs = tmp;
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    var curr = "Current: '" + $this.l27_1.c27_1 + "'";
-    var tmp2_safe_receiver = $this.m27_1;
+    var curr = "Current: '" + $this.k27_1.b27_1 + "'";
+    var tmp2_safe_receiver = $this.l27_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -5462,11 +5467,11 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp_0 = ", Next: '" + tmp2_safe_receiver.c27_1 + "'";
+      tmp_0 = ", Next: '" + tmp2_safe_receiver.b27_1 + "'";
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.j27_1.v28(prev + curr + next);
+    $this.i27_1.y28(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -5479,7 +5484,7 @@
     try {
       // Inline function 'kotlin.Companion.success' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      var value = $this.k27_1.i();
+      var value = $this.j27_1.i();
       tmp = _Result___init__impl__xyqfz8(value);
     } catch ($p) {
       var tmp_0;
@@ -5503,10 +5508,10 @@
     return tmp_1;
   }
   function TokenProvider(logger, list) {
-    this.j27_1 = logger;
-    this.k27_1 = list.fk_1.g();
-    this.l27_1 = list.ek_1;
-    this.m27_1 = nextToken(this);
+    this.i27_1 = logger;
+    this.j27_1 = list.fk_1.g();
+    this.k27_1 = list.ek_1;
+    this.l27_1 = nextToken(this);
     var tmp = this;
     // Inline function 'kotlin.collections.mapNotNull' call
     // Inline function 'kotlin.collections.mapNotNullTo' call
@@ -5520,10 +5525,10 @@
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.definitionNames.<anonymous>' call
       var first = element.qd();
       var second = element.rd();
-      var tmp0_subject = first.d27_1;
+      var tmp0_subject = first.c27_1;
       var tmp_0;
       if (isInterface(tmp0_subject, WirespecDefinition)) {
-        tmp_0 = second.c27_1;
+        tmp_0 = second.b27_1;
       } else {
         tmp_0 = null;
       }
@@ -5536,10 +5541,10 @@
         destination.e(tmp0_safe_receiver);
       }
     }
-    tmp.n27_1 = destination;
+    tmp.m27_1 = destination;
     printTokens$default(this);
   }
-  protoOf(TokenProvider).z27 = function (_this__u8e3s4) {
+  protoOf(TokenProvider).y27 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5549,8 +5554,8 @@
     var tmp;
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      if (!this.n27_1.p1(_this__u8e3s4.c27_1)) {
-        raise.pk(new DefinitionNotExistsException(_this__u8e3s4.c27_1, _this__u8e3s4.e27_1));
+      if (!this.m27_1.p1(_this__u8e3s4.b27_1)) {
+        raise.pk(new DefinitionNotExistsException(_this__u8e3s4.b27_1, _this__u8e3s4.d27_1));
       }
       var res = Unit_instance;
       raise.nk();
@@ -5578,9 +5583,9 @@
     return tmp;
   };
   protoOf(TokenProvider).h = function () {
-    return !(this.m27_1 == null);
+    return !(this.l27_1 == null);
   };
-  protoOf(TokenProvider).o27 = function () {
+  protoOf(TokenProvider).n27 = function () {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5590,17 +5595,17 @@
     var tmp;
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.l27_1;
+      var previousToken = this.k27_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.m27_1;
+      var tmp0_elvis_lhs = this.l27_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
-        raise.pk(new NextException(previousToken.e27_1));
+        raise.pk(new NextException(previousToken.d27_1));
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.l27_1 = tmp_1;
-      this.m27_1 = nextToken(this);
+      tmp_0.k27_1 = tmp_1;
+      this.l27_1 = nextToken(this);
       printTokens(this, previousToken);
       var res = Unit_instance;
       raise.nk();
@@ -5641,9 +5646,9 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseRefinedValidator.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
-      var tmp0_subject = _this__u8e3s4.l27_1.d27_1;
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
+      var tmp0_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_0;
       var tmp_1;
       if (isInterface(tmp0_subject, WirespecDefinition)) {
@@ -5654,7 +5659,7 @@
       if (tmp_1) {
         tmp_0 = accumulatedString;
       } else {
-        tmp_0 = raise.qk(parseRefinedValidator(_this__u8e3s4, $this, accumulatedString + _this__u8e3s4.l27_1.c27_1));
+        tmp_0 = raise.qk(parseRefinedValidator(_this__u8e3s4, $this, accumulatedString + _this__u8e3s4.k27_1.b27_1));
       }
       var res = tmp_0;
       raise.nk();
@@ -5692,12 +5697,12 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
-      var tmp0_subject = _this__u8e3s4.l27_1.d27_1;
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
+      var tmp0_subject = _this__u8e3s4.k27_1.c27_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
-        tmp_0 = new Type_1(comment, typeName, raise.qk($this.y27(_this__u8e3s4)), emptyList());
+        tmp_0 = new Type_0(comment, typeName, raise.qk($this.x27(_this__u8e3s4)), emptyList());
       } else {
         if (tmp0_subject instanceof ForwardSlash) {
           tmp_0 = new Refined(comment, typeName, new Validator(raise.qk(parseRefinedValidator(_this__u8e3s4, $this, '/'))));
@@ -5707,11 +5712,11 @@
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = _this__u8e3s4.l27_1;
+            var actual = _this__u8e3s4.k27_1;
             var this_0 = new WrongTokenException(getKClass(TypeDefinitionStart), actual);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_0);
           }
         }
@@ -5752,57 +5757,57 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
-      if (_this__u8e3s4.l27_1.d27_1 instanceof Colon)
-        raise.qk(_this__u8e3s4.o27());
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
+      if (_this__u8e3s4.k27_1.c27_1 instanceof Colon)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(Colon), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof LeftCurly) {
         // Inline function 'kotlin.also' call
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         tmp_0 = true;
       } else {
         tmp_0 = false;
       }
       var isDict = tmp_0;
-      var type = _this__u8e3s4.l27_1.d27_1;
+      var type = _this__u8e3s4.k27_1.c27_1;
       var tmp_1;
       if (isInterface(type, WirespecType)) {
         // Inline function 'kotlin.also' call
-        var tmp_2 = raise.qk($this.s27(_this__u8e3s4, type, _this__u8e3s4.l27_1.c27_1, isDict));
+        var tmp_2 = raise.qk($this.r27(_this__u8e3s4, type, _this__u8e3s4.k27_1.b27_1, isDict));
         // Inline function 'kotlin.also' call
-        var tmp_3 = _this__u8e3s4.l27_1.d27_1;
+        var tmp_3 = _this__u8e3s4.k27_1.c27_1;
         var this_1 = tmp_3 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
         if (this_1)
-          raise.qk(_this__u8e3s4.o27());
+          raise.qk(_this__u8e3s4.n27());
         var this_2 = new Field(identifier, tmp_2, this_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
         if (isDict) {
-          if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-            raise.qk(_this__u8e3s4.o27());
+          if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+            raise.qk(_this__u8e3s4.n27());
           else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual_0 = _this__u8e3s4.l27_1;
+            var actual_0 = _this__u8e3s4.k27_1;
             var this_3 = new WrongTokenException(getKClass(RightCurly), actual_0);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_3);
           }
         }
@@ -5810,11 +5815,11 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = _this__u8e3s4.l27_1;
+        var actual_1 = _this__u8e3s4.k27_1;
         var this_4 = new WrongTokenException(getKClass(CustomType), actual_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_4);
       }
       var res = tmp_1;
@@ -5853,35 +5858,35 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      $this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      $this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var this_0 = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.z27(_this__u8e3s4.l27_1));
-        this_0.e(new Custom(_this__u8e3s4.l27_1.c27_1, false));
-        raise.qk(_this__u8e3s4.o27());
-        while (equals(_this__u8e3s4.l27_1.d27_1, Pipe_instance)) {
-          raise.qk(_this__u8e3s4.o27());
-          if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
-            raise.qk(_this__u8e3s4.z27(_this__u8e3s4.l27_1));
+        raise.qk(_this__u8e3s4.y27(_this__u8e3s4.k27_1));
+        this_0.e(new Custom(_this__u8e3s4.k27_1.b27_1, false));
+        raise.qk(_this__u8e3s4.n27());
+        while (equals(_this__u8e3s4.k27_1.c27_1, Pipe_instance)) {
+          raise.qk(_this__u8e3s4.n27());
+          if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
+            raise.qk(_this__u8e3s4.y27(_this__u8e3s4.k27_1));
             // Inline function 'kotlin.also' call
-            this_0.e(new Custom(_this__u8e3s4.l27_1.c27_1, false));
+            this_0.e(new Custom(_this__u8e3s4.k27_1.b27_1, false));
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = _this__u8e3s4.l27_1;
+            var actual = _this__u8e3s4.k27_1;
             var this_1 = new WrongTokenException(getKClass(CustomType), actual);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_1);
           }
         }
@@ -5889,11 +5894,11 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var this_2 = new WrongTokenException(getKClass(CustomType), actual_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_2);
       }
       var res = toSet(tmp_0);
@@ -5924,7 +5929,7 @@
   function TypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(TypeParser).u28 = function (_this__u8e3s4, comment) {
+  protoOf(TypeParser).x28 = function (_this__u8e3s4, comment) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5935,19 +5940,19 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomType) {
-        tmp_0 = raise.qk(parseTypeDefinition(_this__u8e3s4, this, comment, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1)));
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomType) {
+        tmp_0 = raise.qk(parseTypeDefinition(_this__u8e3s4, this, comment, new DefinitionIdentifier(_this__u8e3s4.k27_1.b27_1)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.l27_1;
+        var actual = _this__u8e3s4.k27_1;
         var this_0 = new WrongTokenException(getKClass(CustomType), actual);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_0);
       }
       var res = tmp_0;
@@ -5975,7 +5980,7 @@
     }
     return tmp;
   };
-  protoOf(TypeParser).y27 = function (_this__u8e3s4) {
+  protoOf(TypeParser).x27 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5986,30 +5991,30 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>' call
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l27_1.d27_1 instanceof CustomValue) {
+      if (_this__u8e3s4.k27_1.c27_1 instanceof CustomValue) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var this_0 = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        this_0.e(raise.qk(parseField(_this__u8e3s4, this, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1))));
-        while (equals(_this__u8e3s4.l27_1.d27_1, Comma_instance)) {
-          raise.qk(_this__u8e3s4.o27());
-          if (_this__u8e3s4.l27_1.d27_1 instanceof CustomValue)
-            this_0.e(raise.qk(parseField(_this__u8e3s4, this, Companion_instance_6.b27(_this__u8e3s4.l27_1.c27_1))));
+        this_0.e(raise.qk(parseField(_this__u8e3s4, this, new FieldIdentifier(_this__u8e3s4.k27_1.b27_1))));
+        while (equals(_this__u8e3s4.k27_1.c27_1, Comma_instance)) {
+          raise.qk(_this__u8e3s4.n27());
+          if (_this__u8e3s4.k27_1.c27_1 instanceof CustomValue)
+            this_0.e(raise.qk(parseField(_this__u8e3s4, this, new FieldIdentifier(_this__u8e3s4.k27_1.b27_1))));
           else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-            var actual = _this__u8e3s4.l27_1;
+            var actual = _this__u8e3s4.k27_1;
             var this_1 = new WrongTokenException(getKClass(CustomValue), actual);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.qk(_this__u8e3s4.o27());
+            raise.qk(_this__u8e3s4.n27());
             raise.pk(this_1);
           }
         }
@@ -6017,26 +6022,26 @@
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.l27_1;
+        var actual_0 = _this__u8e3s4.k27_1;
         var this_2 = new WrongTokenException(getKClass(CustomValue), actual_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_2);
       }
       var this_3 = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.l27_1.d27_1 instanceof RightCurly)
-        raise.qk(_this__u8e3s4.o27());
+      if (_this__u8e3s4.k27_1.c27_1 instanceof RightCurly)
+        raise.qk(_this__u8e3s4.n27());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_1 = _this__u8e3s4.l27_1;
+        var actual_1 = _this__u8e3s4.k27_1;
         var this_4 = new WrongTokenException(getKClass(RightCurly), actual_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
         raise.pk(this_4);
       }
       // Inline function 'kotlin.contracts.contract' call
@@ -6065,7 +6070,7 @@
     }
     return tmp;
   };
-  protoOf(TypeParser).s27 = function (_this__u8e3s4, wsType, value, isDict) {
+  protoOf(TypeParser).r27 = function (_this__u8e3s4, wsType, value, isDict) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -6076,16 +6081,16 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>' call
-      var previousToken = _this__u8e3s4.l27_1;
-      raise.qk(_this__u8e3s4.o27());
-      this.v27(_this__u8e3s4.l27_1);
+      var previousToken = _this__u8e3s4.k27_1;
+      raise.qk(_this__u8e3s4.n27());
+      this.u27(_this__u8e3s4.k27_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.l27_1.d27_1;
+      var tmp_0 = _this__u8e3s4.k27_1.c27_1;
       var this_0 = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>.<anonymous>' call
       if (this_0)
-        raise.qk(_this__u8e3s4.o27());
+        raise.qk(_this__u8e3s4.n27());
       var isIterable = this_0;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -6104,7 +6109,7 @@
                 tmp_1 = new Unit(isIterable, isDict);
               } else {
                 if (wsType instanceof CustomType) {
-                  raise.qk(_this__u8e3s4.z27(previousToken));
+                  raise.qk(_this__u8e3s4.y27(previousToken));
                   tmp_1 = new Custom(value, isIterable, isDict);
                 } else {
                   noWhenBranchMatchedException();
@@ -6142,15 +6147,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.w28_1 = idx;
-    this.x28_1 = length;
+    this.z28_1 = idx;
+    this.a29_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.w28_1 + ', length=' + this.x28_1 + ')';
+    return 'IdxAndLength(idx=' + this.z28_1 + ', length=' + this.a29_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.w28_1;
-    result = imul(result, 31) + this.x28_1 | 0;
+    var result = this.z28_1;
+    result = imul(result, 31) + this.a29_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -6159,9 +6164,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.w28_1 === tmp0_other_with_cast.w28_1))
+    if (!(this.z28_1 === tmp0_other_with_cast.z28_1))
       return false;
-    if (!(this.x28_1 === tmp0_other_with_cast.x28_1))
+    if (!(this.a29_1 === tmp0_other_with_cast.a29_1))
       return false;
     return true;
   };
@@ -6169,26 +6174,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.f27_1 = line;
-    this.g27_1 = position;
-    this.h27_1 = idxAndLength;
+    this.e27_1 = line;
+    this.f27_1 = position;
+    this.g27_1 = idxAndLength;
   }
-  protoOf(Coordinates).y28 = function (line, position, idxAndLength) {
+  protoOf(Coordinates).b29 = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).z28 = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.f27_1 : line;
-    position = position === VOID ? this.g27_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.h27_1 : idxAndLength;
-    return $super === VOID ? this.y28(line, position, idxAndLength) : $super.y28.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).c29 = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.e27_1 : line;
+    position = position === VOID ? this.f27_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.g27_1 : idxAndLength;
+    return $super === VOID ? this.b29(line, position, idxAndLength) : $super.b29.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.f27_1 + ', position=' + this.g27_1 + ', idxAndLength=' + this.h27_1.toString() + ')';
+    return 'Coordinates(line=' + this.e27_1 + ', position=' + this.f27_1 + ', idxAndLength=' + this.g27_1.toString() + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.f27_1;
-    result = imul(result, 31) + this.g27_1 | 0;
-    result = imul(result, 31) + this.h27_1.hashCode() | 0;
+    var result = this.e27_1;
+    result = imul(result, 31) + this.f27_1 | 0;
+    result = imul(result, 31) + this.g27_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -6197,29 +6202,29 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.f27_1 === tmp0_other_with_cast.f27_1))
+    if (!(this.e27_1 === tmp0_other_with_cast.e27_1))
       return false;
-    if (!(this.g27_1 === tmp0_other_with_cast.g27_1))
+    if (!(this.f27_1 === tmp0_other_with_cast.f27_1))
       return false;
-    if (!this.h27_1.equals(tmp0_other_with_cast.h27_1))
+    if (!this.g27_1.equals(tmp0_other_with_cast.g27_1))
       return false;
     return true;
   };
   function Token(value, type, coordinates) {
-    this.c27_1 = value;
-    this.d27_1 = type;
-    this.e27_1 = coordinates;
+    this.b27_1 = value;
+    this.c27_1 = type;
+    this.d27_1 = coordinates;
   }
   protoOf(Token).b1 = function () {
-    return this.c27_1;
+    return this.b27_1;
   };
   protoOf(Token).toString = function () {
-    return 'Token(value=' + this.c27_1 + ', type=' + toString(this.d27_1) + ', coordinates=' + this.e27_1.toString() + ')';
+    return 'Token(value=' + this.b27_1 + ', type=' + toString(this.c27_1) + ', coordinates=' + this.d27_1.toString() + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = getStringHashCode(this.c27_1);
-    result = imul(result, 31) + hashCode(this.d27_1) | 0;
-    result = imul(result, 31) + this.e27_1.hashCode() | 0;
+    var result = getStringHashCode(this.b27_1);
+    result = imul(result, 31) + hashCode(this.c27_1) | 0;
+    result = imul(result, 31) + this.d27_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -6228,19 +6233,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!(this.c27_1 === tmp0_other_with_cast.c27_1))
+    if (!(this.b27_1 === tmp0_other_with_cast.b27_1))
       return false;
-    if (!equals(this.d27_1, tmp0_other_with_cast.d27_1))
+    if (!equals(this.c27_1, tmp0_other_with_cast.c27_1))
       return false;
-    if (!this.e27_1.equals(tmp0_other_with_cast.e27_1))
+    if (!this.d27_1.equals(tmp0_other_with_cast.d27_1))
       return false;
     return true;
   };
   function plus(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.w28_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.z28_1 + length | 0, length);
   }
   function plus_0(_this__u8e3s4, length) {
-    return _this__u8e3s4.z28(VOID, _this__u8e3s4.g27_1 + length | 0, plus(_this__u8e3s4.h27_1, length));
+    return _this__u8e3s4.c29(VOID, _this__u8e3s4.f27_1 + length | 0, plus(_this__u8e3s4.g27_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp1_coordinates = new Coordinates();
@@ -6252,12 +6257,12 @@
     var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var _destruct__k2r9zo = extractToken($this, source_0, last(incompleteTokens_0).e27_1);
+        var _destruct__k2r9zo = extractToken($this, source_0, last(incompleteTokens_0).d27_1);
         var token = _destruct__k2r9zo.qd();
         var remaining = _destruct__k2r9zo.rd();
         var tokens = incompleteTokens_0.jk(token);
         var tmp;
-        var tmp_0 = token.d27_1;
+        var tmp_0 = token.c27_1;
         if (tmp_0 instanceof EndOfProgram) {
           tmp = tokens;
         } else {
@@ -6299,7 +6304,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.c27_1));
+      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.b27_1));
     }
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
@@ -6315,7 +6320,7 @@
   function nextCoordinates(_this__u8e3s4, type, value) {
     var tmp;
     if (type instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.f27_1 + 1 | 0, VOID, plus(_this__u8e3s4.h27_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.e27_1 + 1 | 0, VOID, plus(_this__u8e3s4.g27_1, value.length));
     } else {
       tmp = plus_0(_this__u8e3s4, value.length);
     }
@@ -6329,7 +6334,7 @@
     while (tmp0_iterator.h()) {
       var element = tmp0_iterator.i();
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace.<anonymous>' call
-      var tmp = element.d27_1;
+      var tmp = element.c27_1;
       if (!isInterface(tmp, WhiteSpace)) {
         destination.e(element);
       }
@@ -6949,7 +6954,7 @@
     return StartOfProgram_instance;
   }
   function EndOfProgram() {
-    this.a29_1 = 'EOP';
+    this.d29_1 = 'EOP';
   }
   protoOf(EndOfProgram).toString = function () {
     return 'EndOfProgram';
@@ -6998,7 +7003,7 @@
             if (item instanceof Refined) {
               tmp = item;
             } else {
-              if (item instanceof Type_1) {
+              if (item instanceof Type_0) {
                 // Inline function 'kotlin.collections.map' call
                 // Inline function 'kotlin.collections.filter' call
                 // Inline function 'kotlin.collections.filterIsInstance' call
@@ -7035,7 +7040,7 @@
                     var tmp$ret$2 = tmp_0;
                     destination_2.e(tmp$ret$2);
                   }
-                  if (destination_2.p1(item.a23_1.y22_1)) {
+                  if (destination_2.p1(item.z22_1.b1())) {
                     destination_1.e(element_0);
                   }
                 }
@@ -7045,10 +7050,10 @@
                 while (tmp0_iterator_3.h()) {
                   var item_1 = tmp0_iterator_3.i();
                   // Inline function 'community.flock.wirespec.compiler.core.validate.validate.<anonymous>.<anonymous>' call
-                  var tmp$ret$8 = new Custom(item_1.t22_1.y22_1, false);
+                  var tmp$ret$8 = new Custom(item_1.t22_1.b1(), false);
                   destination_3.e(tmp$ret$8);
                 }
-                tmp = item.t28(VOID, VOID, VOID, destination_3);
+                tmp = item.s28(VOID, VOID, VOID, destination_3);
               } else {
                 if (item instanceof Union) {
                   tmp = item;
@@ -7074,14 +7079,14 @@
   var Level_INFO_instance;
   var Level_WARN_instance;
   var Level_ERROR_instance;
-  function Companion_6() {
+  function Companion_5() {
   }
-  protoOf(Companion_6).toString = function () {
+  protoOf(Companion_5).toString = function () {
     return joinToString(get_entries_0(), ', ');
   };
-  var Companion_instance_7;
-  function Companion_getInstance_6() {
-    return Companion_instance_7;
+  var Companion_instance_6;
+  function Companion_getInstance_5() {
+    return Companion_instance_6;
   }
   function values_0() {
     return [Level_DEBUG_getInstance(), Level_INFO_getInstance(), Level_WARN_getInstance(), Level_ERROR_getInstance()];
@@ -7201,17 +7206,17 @@
     }
     tmp_5.c22_1 = tmp_6;
   }
-  protoOf(Logger).b29 = function () {
+  protoOf(Logger).e29 = function () {
     return this.z21_1;
   };
-  protoOf(Logger).c29 = function () {
+  protoOf(Logger).f29 = function () {
     return this.a22_1;
   };
-  protoOf(Logger).v28 = function (string) {
-    return logIf(string, this, this.b29());
+  protoOf(Logger).y28 = function (string) {
+    return logIf(string, this, this.e29());
   };
   protoOf(Logger).d22 = function (string) {
-    return logIf(string, this, this.c29());
+    return logIf(string, this, this.f29());
   };
   function noLogger$1() {
     Logger.call(this, null);
@@ -7223,13 +7228,9 @@
       noLogger = new noLogger$1();
     }
   }
-  //region block: post-declaration
-  protoOf(Emitter).l24 = emit;
-  //endregion
   //region block: init
   Spacer_instance = new Spacer();
   Companion_instance_5 = new Companion_4();
-  Companion_instance_6 = new Companion_5();
   WsTypeDef_instance = new WsTypeDef();
   WsEnumTypeDef_instance = new WsEnumTypeDef();
   WsEndpointDef_instance = new WsEndpointDef();
@@ -7261,7 +7262,7 @@
   Character_instance = new Character();
   StartOfProgram_instance = new StartOfProgram();
   EndOfProgram_instance = new EndOfProgram();
-  Companion_instance_7 = new Companion_6();
+  Companion_instance_6 = new Companion_5();
   //endregion
   //region block: exports
   _.$_$ = _.$_$ || {};
@@ -7273,55 +7274,56 @@
   _.$_$.f = WirespecEmitter;
   _.$_$.g = Channel;
   _.$_$.h = Comment;
-  _.$_$.i = Definition;
-  _.$_$.j = Content;
-  _.$_$.k = get_entries;
-  _.$_$.l = Request;
-  _.$_$.m = Response;
-  _.$_$.n = Literal;
-  _.$_$.o = Param_0;
-  _.$_$.p = Endpoint;
-  _.$_$.q = Enum_0;
-  _.$_$.r = Field;
-  _.$_$.s = Parser;
-  _.$_$.t = Any;
-  _.$_$.u = Custom;
-  _.$_$.v = Primitive;
-  _.$_$.w = Unit;
-  _.$_$.x = Validator;
-  _.$_$.y = Refined;
-  _.$_$.z = Shape;
-  _.$_$.a1 = Type_1;
-  _.$_$.b1 = Union;
-  _.$_$.c1 = name;
-  _.$_$.d1 = tokenize;
-  _.$_$.e1 = compile;
-  _.$_$.f1 = component1;
-  _.$_$.g1 = parse;
-  _.$_$.h1 = Logger;
-  _.$_$.i1 = get_noLogger;
-  _.$_$.j1 = Method_DELETE_getInstance;
-  _.$_$.k1 = Method_GET_getInstance;
-  _.$_$.l1 = Method_HEAD_getInstance;
-  _.$_$.m1 = Method_OPTIONS_getInstance;
-  _.$_$.n1 = Method_PATCH_getInstance;
-  _.$_$.o1 = Method_POST_getInstance;
-  _.$_$.p1 = Method_PUT_getInstance;
-  _.$_$.q1 = Method_TRACE_getInstance;
-  _.$_$.r1 = Type_Boolean_getInstance;
-  _.$_$.s1 = Type_Integer_getInstance;
-  _.$_$.t1 = Type_Number_getInstance;
-  _.$_$.u1 = Type_String_getInstance;
-  _.$_$.v1 = Level_DEBUG_getInstance;
-  _.$_$.w1 = Level_ERROR_getInstance;
-  _.$_$.x1 = Level_INFO_getInstance;
-  _.$_$.y1 = Level_WARN_getInstance;
-  _.$_$.z1 = _Comment___init__impl__cg8s2u;
-  _.$_$.a2 = _Comment___get_value__impl__8r3pla;
-  _.$_$.b2 = Companion_getInstance_3;
-  _.$_$.c2 = Companion_instance_6;
-  _.$_$.d2 = WirespecSpec_getInstance;
-  _.$_$.e2 = Companion_instance_7;
+  _.$_$.i = DefinitionIdentifier;
+  _.$_$.j = Definition;
+  _.$_$.k = Content;
+  _.$_$.l = get_entries;
+  _.$_$.m = Request;
+  _.$_$.n = Response;
+  _.$_$.o = Literal;
+  _.$_$.p = Param_0;
+  _.$_$.q = Endpoint;
+  _.$_$.r = Enum_0;
+  _.$_$.s = FieldIdentifier;
+  _.$_$.t = Field;
+  _.$_$.u = Parser;
+  _.$_$.v = Any;
+  _.$_$.w = Custom;
+  _.$_$.x = Primitive;
+  _.$_$.y = Unit;
+  _.$_$.z = Validator;
+  _.$_$.a1 = Refined;
+  _.$_$.b1 = Shape;
+  _.$_$.c1 = Type_0;
+  _.$_$.d1 = Union;
+  _.$_$.e1 = name;
+  _.$_$.f1 = tokenize;
+  _.$_$.g1 = compile;
+  _.$_$.h1 = component1;
+  _.$_$.i1 = parse;
+  _.$_$.j1 = Logger;
+  _.$_$.k1 = get_noLogger;
+  _.$_$.l1 = Method_DELETE_getInstance;
+  _.$_$.m1 = Method_GET_getInstance;
+  _.$_$.n1 = Method_HEAD_getInstance;
+  _.$_$.o1 = Method_OPTIONS_getInstance;
+  _.$_$.p1 = Method_PATCH_getInstance;
+  _.$_$.q1 = Method_POST_getInstance;
+  _.$_$.r1 = Method_PUT_getInstance;
+  _.$_$.s1 = Method_TRACE_getInstance;
+  _.$_$.t1 = Type_Boolean_getInstance;
+  _.$_$.u1 = Type_Integer_getInstance;
+  _.$_$.v1 = Type_Number_getInstance;
+  _.$_$.w1 = Type_String_getInstance;
+  _.$_$.x1 = Level_DEBUG_getInstance;
+  _.$_$.y1 = Level_ERROR_getInstance;
+  _.$_$.z1 = Level_INFO_getInstance;
+  _.$_$.a2 = Level_WARN_getInstance;
+  _.$_$.b2 = _Comment___init__impl__cg8s2u;
+  _.$_$.c2 = _Comment___get_value__impl__8r3pla;
+  _.$_$.d2 = Companion_getInstance_3;
+  _.$_$.e2 = WirespecSpec_getInstance;
+  _.$_$.f2 = Companion_instance_6;
   //endregion
   return _;
 }));