diff --git a/grammar.js b/grammar.js
index 0992961..07db00d 100644
--- a/grammar.js
+++ b/grammar.js
@@ -184,11 +184,10 @@ module.exports = grammar({
       seq("variant", field("name", $.id), field("body", $.variant_body)),
 
     variant_body: ($) =>
-      seq(
-        "{",
-        field("variant_cases", optionalCommaSeparatedList($.variant_case)),
-        "}",
-      ),
+      seq("{", $.variant_cases, "}",),
+
+    variant_cases: ($) =>
+      commaSeparatedList($.variant_case),
 
     variant_case: ($) =>
       choice(
@@ -199,7 +198,13 @@ module.exports = grammar({
     enum_items: ($) => seq("enum", field("name", $.id), $.enum_body),
 
     enum_body: ($) =>
-      seq("{", field("enum_cases", optionalCommaSeparatedList($.id)), "}"),
+      seq("{", $.enum_cases, "}"),
+
+    enum_cases: ($) =>
+      commaSeparatedList($.enum_case),
+
+    enum_case: ($) =>
+      field("name", $.id),
 
     resource_item: ($) =>
       seq(
diff --git a/queries/highlights.scm b/queries/highlights.scm
index d726a68..0247856 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -67,8 +67,8 @@
 (enum_items
   name: (id) @type)
 
-(enum_body
-  enum_cases: (id) @constant)
+(enum_case
+  name: (id) @constant)
 
 (resource_item
   name: (id) @type)
diff --git a/src/grammar.json b/src/grammar.json
index e23e681..db64ba8 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -1258,57 +1258,49 @@
           "value": "{"
         },
         {
-          "type": "FIELD",
-          "name": "variant_cases",
+          "type": "SYMBOL",
+          "name": "variant_cases"
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "variant_cases": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "variant_case"
+        },
+        {
+          "type": "REPEAT",
           "content": {
-            "type": "CHOICE",
+            "type": "SEQ",
             "members": [
               {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "variant_case"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "variant_case"
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  }
-                ]
+                "type": "STRING",
+                "value": ","
               },
               {
-                "type": "BLANK"
+                "type": "SYMBOL",
+                "name": "variant_case"
               }
             ]
           }
         },
         {
-          "type": "STRING",
-          "value": "}"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -1383,60 +1375,60 @@
           "value": "{"
         },
         {
-          "type": "FIELD",
-          "name": "enum_cases",
+          "type": "SYMBOL",
+          "name": "enum_cases"
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "enum_cases": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "enum_case"
+        },
+        {
+          "type": "REPEAT",
           "content": {
-            "type": "CHOICE",
+            "type": "SEQ",
             "members": [
               {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "id"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "id"
-                        }
-                      ]
-                    }
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  }
-                ]
+                "type": "STRING",
+                "value": ","
               },
               {
-                "type": "BLANK"
+                "type": "SYMBOL",
+                "name": "enum_case"
               }
             ]
           }
         },
         {
-          "type": "STRING",
-          "value": "}"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
+    "enum_case": {
+      "type": "FIELD",
+      "name": "name",
+      "content": {
+        "type": "SYMBOL",
+        "name": "id"
+      }
+    },
     "resource_item": {
       "type": "SEQ",
       "members": [
diff --git a/src/node-types.json b/src/node-types.json
index e7aec88..a7b0023 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -2,15 +2,26 @@
   {
     "type": "enum_body",
     "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "enum_cases",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "enum_case",
+    "named": true,
     "fields": {
-      "enum_cases": {
-        "multiple": true,
-        "required": false,
+      "name": {
+        "multiple": false,
+        "required": true,
         "types": [
-          {
-            "type": ",",
-            "named": false
-          },
           {
             "type": "id",
             "named": true
@@ -19,6 +30,21 @@
       }
     }
   },
+  {
+    "type": "enum_cases",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "enum_case",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "enum_items",
     "named": true,
@@ -922,21 +948,16 @@
   {
     "type": "variant_body",
     "named": true,
-    "fields": {
-      "variant_cases": {
-        "multiple": true,
-        "required": false,
-        "types": [
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "variant_case",
-            "named": true
-          }
-        ]
-      }
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "variant_cases",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -965,6 +986,21 @@
       }
     }
   },
+  {
+    "type": "variant_cases",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "variant_case",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "variant_items",
     "named": true,
diff --git a/src/parser.c b/src/parser.c
index 1d55072..232f207 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -13,15 +13,15 @@
 #endif
 
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 332
+#define STATE_COUNT 320
 #define LARGE_STATE_COUNT 2
-#define SYMBOL_COUNT 118
+#define SYMBOL_COUNT 122
 #define ALIAS_COUNT 0
 #define TOKEN_COUNT 57
 #define EXTERNAL_TOKEN_COUNT 0
-#define FIELD_COUNT 27
+#define FIELD_COUNT 25
 #define MAX_ALIAS_SEQUENCE_LENGTH 7
-#define PRODUCTION_ID_COUNT 44
+#define PRODUCTION_ID_COUNT 38
 
 enum ts_symbol_identifiers {
   anon_sym_package = 1,
@@ -115,32 +115,36 @@ enum ts_symbol_identifiers {
   sym_flags_body = 89,
   sym_variant_items = 90,
   sym_variant_body = 91,
-  sym_variant_case = 92,
-  sym_enum_items = 93,
-  sym_enum_body = 94,
-  sym_resource_item = 95,
-  sym_resource_body = 96,
-  sym_resource_method = 97,
-  sym_ty = 98,
-  sym_tuple = 99,
-  sym_tuple_list = 100,
-  sym_list = 101,
-  sym_option = 102,
-  sym_result = 103,
-  sym_handle = 104,
-  aux_sym_source_file_repeat1 = 105,
-  aux_sym_package_decl_repeat1 = 106,
-  aux_sym_package_decl_repeat2 = 107,
-  aux_sym_world_body_repeat1 = 108,
-  aux_sym_include_names_list_repeat1 = 109,
-  aux_sym_interface_body_repeat1 = 110,
-  aux_sym_named_type_list_repeat1 = 111,
-  aux_sym_use_names_list_repeat1 = 112,
-  aux_sym_record_body_repeat1 = 113,
-  aux_sym_flags_body_repeat1 = 114,
-  aux_sym_variant_body_repeat1 = 115,
-  aux_sym_resource_body_repeat1 = 116,
-  aux_sym_tuple_list_repeat1 = 117,
+  sym_variant_cases = 92,
+  sym_variant_case = 93,
+  sym_enum_items = 94,
+  sym_enum_body = 95,
+  sym_enum_cases = 96,
+  sym_enum_case = 97,
+  sym_resource_item = 98,
+  sym_resource_body = 99,
+  sym_resource_method = 100,
+  sym_ty = 101,
+  sym_tuple = 102,
+  sym_tuple_list = 103,
+  sym_list = 104,
+  sym_option = 105,
+  sym_result = 106,
+  sym_handle = 107,
+  aux_sym_source_file_repeat1 = 108,
+  aux_sym_package_decl_repeat1 = 109,
+  aux_sym_package_decl_repeat2 = 110,
+  aux_sym_world_body_repeat1 = 111,
+  aux_sym_include_names_list_repeat1 = 112,
+  aux_sym_interface_body_repeat1 = 113,
+  aux_sym_named_type_list_repeat1 = 114,
+  aux_sym_use_names_list_repeat1 = 115,
+  aux_sym_record_body_repeat1 = 116,
+  aux_sym_flags_body_repeat1 = 117,
+  aux_sym_variant_cases_repeat1 = 118,
+  aux_sym_enum_cases_repeat1 = 119,
+  aux_sym_resource_body_repeat1 = 120,
+  aux_sym_tuple_list_repeat1 = 121,
 };
 
 static const char * const ts_symbol_names[] = {
@@ -236,9 +240,12 @@ static const char * const ts_symbol_names[] = {
   [sym_flags_body] = "flags_body",
   [sym_variant_items] = "variant_items",
   [sym_variant_body] = "variant_body",
+  [sym_variant_cases] = "variant_cases",
   [sym_variant_case] = "variant_case",
   [sym_enum_items] = "enum_items",
   [sym_enum_body] = "enum_body",
+  [sym_enum_cases] = "enum_cases",
+  [sym_enum_case] = "enum_case",
   [sym_resource_item] = "resource_item",
   [sym_resource_body] = "resource_body",
   [sym_resource_method] = "resource_method",
@@ -259,7 +266,8 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_use_names_list_repeat1] = "use_names_list_repeat1",
   [aux_sym_record_body_repeat1] = "record_body_repeat1",
   [aux_sym_flags_body_repeat1] = "flags_body_repeat1",
-  [aux_sym_variant_body_repeat1] = "variant_body_repeat1",
+  [aux_sym_variant_cases_repeat1] = "variant_cases_repeat1",
+  [aux_sym_enum_cases_repeat1] = "enum_cases_repeat1",
   [aux_sym_resource_body_repeat1] = "resource_body_repeat1",
   [aux_sym_tuple_list_repeat1] = "tuple_list_repeat1",
 };
@@ -357,9 +365,12 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_flags_body] = sym_flags_body,
   [sym_variant_items] = sym_variant_items,
   [sym_variant_body] = sym_variant_body,
+  [sym_variant_cases] = sym_variant_cases,
   [sym_variant_case] = sym_variant_case,
   [sym_enum_items] = sym_enum_items,
   [sym_enum_body] = sym_enum_body,
+  [sym_enum_cases] = sym_enum_cases,
+  [sym_enum_case] = sym_enum_case,
   [sym_resource_item] = sym_resource_item,
   [sym_resource_body] = sym_resource_body,
   [sym_resource_method] = sym_resource_method,
@@ -380,7 +391,8 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_use_names_list_repeat1] = aux_sym_use_names_list_repeat1,
   [aux_sym_record_body_repeat1] = aux_sym_record_body_repeat1,
   [aux_sym_flags_body_repeat1] = aux_sym_flags_body_repeat1,
-  [aux_sym_variant_body_repeat1] = aux_sym_variant_body_repeat1,
+  [aux_sym_variant_cases_repeat1] = aux_sym_variant_cases_repeat1,
+  [aux_sym_enum_cases_repeat1] = aux_sym_enum_cases_repeat1,
   [aux_sym_resource_body_repeat1] = aux_sym_resource_body_repeat1,
   [aux_sym_tuple_list_repeat1] = aux_sym_tuple_list_repeat1,
 };
@@ -754,6 +766,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [sym_variant_cases] = {
+    .visible = true,
+    .named = true,
+  },
   [sym_variant_case] = {
     .visible = true,
     .named = true,
@@ -766,6 +782,14 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [sym_enum_cases] = {
+    .visible = true,
+    .named = true,
+  },
+  [sym_enum_case] = {
+    .visible = true,
+    .named = true,
+  },
   [sym_resource_item] = {
     .visible = true,
     .named = true,
@@ -846,7 +870,11 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_variant_body_repeat1] = {
+  [aux_sym_variant_cases_repeat1] = {
+    .visible = false,
+    .named = false,
+  },
+  [aux_sym_enum_cases_repeat1] = {
     .visible = false,
     .named = false,
   },
@@ -863,38 +891,35 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
 enum ts_field_identifiers {
   field_alias = 1,
   field_body = 2,
-  field_enum_cases = 3,
-  field_export_item = 4,
-  field_flags_fields = 5,
-  field_func = 6,
-  field_import_item = 7,
-  field_include_item = 8,
-  field_include_names_body = 9,
-  field_include_names_item = 10,
-  field_include_names_list = 11,
-  field_interface_items = 12,
-  field_name = 13,
-  field_param_list = 14,
-  field_path = 15,
-  field_record_fields = 16,
-  field_resource_body = 17,
-  field_result_list = 18,
-  field_type = 19,
-  field_typedef = 20,
-  field_typedef_item = 21,
-  field_use = 22,
-  field_use_item = 23,
-  field_use_names_item = 24,
-  field_use_path = 25,
-  field_variant_cases = 26,
-  field_world_items = 27,
+  field_export_item = 3,
+  field_flags_fields = 4,
+  field_func = 5,
+  field_import_item = 6,
+  field_include_item = 7,
+  field_include_names_body = 8,
+  field_include_names_item = 9,
+  field_include_names_list = 10,
+  field_interface_items = 11,
+  field_name = 12,
+  field_param_list = 13,
+  field_path = 14,
+  field_record_fields = 15,
+  field_resource_body = 16,
+  field_result_list = 17,
+  field_type = 18,
+  field_typedef = 19,
+  field_typedef_item = 20,
+  field_use = 21,
+  field_use_item = 22,
+  field_use_names_item = 23,
+  field_use_path = 24,
+  field_world_items = 25,
 };
 
 static const char * const ts_field_names[] = {
   [0] = NULL,
   [field_alias] = "alias",
   [field_body] = "body",
-  [field_enum_cases] = "enum_cases",
   [field_export_item] = "export_item",
   [field_flags_fields] = "flags_fields",
   [field_func] = "func",
@@ -917,7 +942,6 @@ static const char * const ts_field_names[] = {
   [field_use_item] = "use_item",
   [field_use_names_item] = "use_names_item",
   [field_use_path] = "use_path",
-  [field_variant_cases] = "variant_cases",
   [field_world_items] = "world_items",
 };
 
@@ -946,25 +970,19 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [22] = {.index = 26, .length = 2},
   [23] = {.index = 28, .length = 1},
   [24] = {.index = 29, .length = 1},
-  [25] = {.index = 30, .length = 1},
-  [26] = {.index = 31, .length = 1},
-  [27] = {.index = 32, .length = 2},
-  [28] = {.index = 34, .length = 2},
-  [29] = {.index = 36, .length = 1},
-  [30] = {.index = 37, .length = 2},
-  [31] = {.index = 39, .length = 2},
-  [32] = {.index = 41, .length = 2},
-  [33] = {.index = 43, .length = 2},
-  [34] = {.index = 45, .length = 2},
+  [25] = {.index = 30, .length = 2},
+  [26] = {.index = 32, .length = 2},
+  [27] = {.index = 34, .length = 1},
+  [28] = {.index = 35, .length = 2},
+  [29] = {.index = 37, .length = 2},
+  [30] = {.index = 39, .length = 2},
+  [31] = {.index = 41, .length = 2},
+  [32] = {.index = 43, .length = 1},
+  [33] = {.index = 44, .length = 2},
+  [34] = {.index = 46, .length = 1},
   [35] = {.index = 47, .length = 2},
-  [36] = {.index = 49, .length = 1},
-  [37] = {.index = 50, .length = 2},
-  [38] = {.index = 52, .length = 1},
-  [39] = {.index = 53, .length = 2},
-  [40] = {.index = 55, .length = 3},
-  [41] = {.index = 58, .length = 3},
-  [42] = {.index = 61, .length = 3},
-  [43] = {.index = 64, .length = 3},
+  [36] = {.index = 49, .length = 3},
+  [37] = {.index = 52, .length = 3},
 };
 
 static const TSFieldMapEntry ts_field_map_entries[] = {
@@ -1023,61 +1041,43 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
   [29] =
     {field_flags_fields, 1},
   [30] =
-    {field_variant_cases, 1},
-  [31] =
-    {field_enum_cases, 1},
-  [32] =
     {field_param_list, 1},
     {field_result_list, 2},
-  [34] =
+  [32] =
     {field_use_names_item, 0},
     {field_use_names_item, 1, .inherited = true},
-  [36] =
+  [34] =
     {field_include_names_list, 1},
-  [37] =
+  [35] =
     {field_include_names_item, 0},
     {field_include_names_item, 1, .inherited = true},
-  [39] =
+  [37] =
     {field_name, 0},
     {field_type, 2},
-  [41] =
+  [39] =
     {field_record_fields, 1},
     {field_record_fields, 2},
-  [43] =
+  [41] =
     {field_flags_fields, 1},
     {field_flags_fields, 2},
-  [45] =
-    {field_variant_cases, 1},
-    {field_variant_cases, 2},
-  [47] =
-    {field_enum_cases, 1},
-    {field_enum_cases, 2},
-  [49] =
+  [43] =
     {field_use_names_item, 1},
-  [50] =
+  [44] =
     {field_use_names_item, 0, .inherited = true},
     {field_use_names_item, 1, .inherited = true},
-  [52] =
+  [46] =
     {field_include_names_item, 1},
-  [53] =
+  [47] =
     {field_include_names_item, 0, .inherited = true},
     {field_include_names_item, 1, .inherited = true},
-  [55] =
+  [49] =
     {field_record_fields, 1},
     {field_record_fields, 2},
     {field_record_fields, 3},
-  [58] =
+  [52] =
     {field_flags_fields, 1},
     {field_flags_fields, 2},
     {field_flags_fields, 3},
-  [61] =
-    {field_variant_cases, 1},
-    {field_variant_cases, 2},
-    {field_variant_cases, 3},
-  [64] =
-    {field_enum_cases, 1},
-    {field_enum_cases, 2},
-    {field_enum_cases, 3},
 };
 
 static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = {
@@ -1099,9 +1099,9 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [7] = 7,
   [8] = 8,
   [9] = 9,
-  [10] = 10,
+  [10] = 8,
   [11] = 11,
-  [12] = 7,
+  [12] = 12,
   [13] = 13,
   [14] = 14,
   [15] = 15,
@@ -1149,45 +1149,45 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [57] = 57,
   [58] = 58,
   [59] = 59,
-  [60] = 60,
-  [61] = 61,
-  [62] = 62,
+  [60] = 36,
+  [61] = 27,
+  [62] = 52,
   [63] = 63,
-  [64] = 64,
-  [65] = 65,
-  [66] = 64,
-  [67] = 46,
-  [68] = 68,
-  [69] = 39,
-  [70] = 65,
-  [71] = 27,
-  [72] = 37,
-  [73] = 36,
-  [74] = 35,
-  [75] = 63,
-  [76] = 33,
-  [77] = 29,
-  [78] = 44,
-  [79] = 30,
-  [80] = 31,
-  [81] = 32,
-  [82] = 34,
-  [83] = 47,
-  [84] = 45,
-  [85] = 49,
-  [86] = 57,
-  [87] = 41,
-  [88] = 26,
-  [89] = 48,
-  [90] = 50,
+  [64] = 53,
+  [65] = 54,
+  [66] = 58,
+  [67] = 37,
+  [68] = 38,
+  [69] = 69,
+  [70] = 43,
+  [71] = 71,
+  [72] = 72,
+  [73] = 44,
+  [74] = 26,
+  [75] = 51,
+  [76] = 55,
+  [77] = 56,
+  [78] = 33,
+  [79] = 29,
+  [80] = 28,
+  [81] = 34,
+  [82] = 32,
+  [83] = 31,
+  [84] = 30,
+  [85] = 85,
+  [86] = 86,
+  [87] = 87,
+  [88] = 88,
+  [89] = 89,
+  [90] = 90,
   [91] = 91,
   [92] = 92,
-  [93] = 58,
-  [94] = 51,
-  [95] = 62,
+  [93] = 93,
+  [94] = 93,
+  [95] = 95,
   [96] = 96,
   [97] = 97,
-  [98] = 98,
+  [98] = 96,
   [99] = 99,
   [100] = 100,
   [101] = 101,
@@ -1196,9 +1196,9 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [104] = 104,
   [105] = 105,
   [106] = 106,
-  [107] = 104,
+  [107] = 107,
   [108] = 108,
-  [109] = 106,
+  [109] = 109,
   [110] = 110,
   [111] = 111,
   [112] = 112,
@@ -1237,34 +1237,34 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [145] = 145,
   [146] = 146,
   [147] = 147,
-  [148] = 148,
+  [148] = 126,
   [149] = 149,
   [150] = 150,
-  [151] = 151,
+  [151] = 128,
   [152] = 152,
   [153] = 153,
   [154] = 154,
   [155] = 155,
-  [156] = 138,
+  [156] = 133,
   [157] = 157,
-  [158] = 158,
+  [158] = 150,
   [159] = 159,
-  [160] = 160,
-  [161] = 160,
-  [162] = 158,
-  [163] = 157,
-  [164] = 159,
-  [165] = 141,
-  [166] = 150,
-  [167] = 154,
-  [168] = 153,
+  [160] = 135,
+  [161] = 161,
+  [162] = 146,
+  [163] = 139,
+  [164] = 164,
+  [165] = 165,
+  [166] = 166,
+  [167] = 157,
+  [168] = 168,
   [169] = 169,
-  [170] = 155,
+  [170] = 170,
   [171] = 171,
   [172] = 172,
-  [173] = 139,
-  [174] = 143,
-  [175] = 68,
+  [173] = 173,
+  [174] = 153,
+  [175] = 175,
   [176] = 176,
   [177] = 177,
   [178] = 178,
@@ -1273,20 +1273,20 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [181] = 181,
   [182] = 182,
   [183] = 183,
-  [184] = 145,
-  [185] = 185,
+  [184] = 184,
+  [185] = 144,
   [186] = 186,
   [187] = 187,
   [188] = 188,
-  [189] = 189,
-  [190] = 190,
-  [191] = 147,
+  [189] = 63,
+  [190] = 130,
+  [191] = 191,
   [192] = 192,
-  [193] = 172,
+  [193] = 193,
   [194] = 194,
   [195] = 195,
   [196] = 196,
-  [197] = 151,
+  [197] = 197,
   [198] = 198,
   [199] = 199,
   [200] = 200,
@@ -1301,13 +1301,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [209] = 209,
   [210] = 210,
   [211] = 211,
-  [212] = 212,
-  [213] = 213,
+  [212] = 201,
+  [213] = 209,
   [214] = 214,
-  [215] = 214,
-  [216] = 216,
-  [217] = 217,
-  [218] = 208,
+  [215] = 215,
+  [216] = 196,
+  [217] = 207,
+  [218] = 218,
   [219] = 219,
   [220] = 220,
   [221] = 221,
@@ -1316,28 +1316,28 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [224] = 224,
   [225] = 225,
   [226] = 226,
-  [227] = 227,
+  [227] = 218,
   [228] = 228,
-  [229] = 228,
+  [229] = 222,
   [230] = 230,
   [231] = 231,
   [232] = 232,
   [233] = 233,
   [234] = 234,
-  [235] = 222,
-  [236] = 216,
+  [235] = 235,
+  [236] = 236,
   [237] = 237,
-  [238] = 220,
+  [238] = 202,
   [239] = 239,
   [240] = 240,
   [241] = 241,
   [242] = 242,
-  [243] = 231,
+  [243] = 243,
   [244] = 244,
   [245] = 245,
-  [246] = 232,
-  [247] = 233,
-  [248] = 234,
+  [246] = 246,
+  [247] = 247,
+  [248] = 248,
   [249] = 249,
   [250] = 250,
   [251] = 251,
@@ -1373,54 +1373,42 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [281] = 281,
   [282] = 282,
   [283] = 283,
-  [284] = 284,
+  [284] = 259,
   [285] = 285,
   [286] = 286,
   [287] = 287,
   [288] = 288,
   [289] = 289,
-  [290] = 265,
+  [290] = 290,
   [291] = 291,
-  [292] = 292,
+  [292] = 290,
   [293] = 293,
   [294] = 294,
   [295] = 295,
-  [296] = 296,
+  [296] = 257,
   [297] = 297,
   [298] = 298,
   [299] = 299,
   [300] = 300,
   [301] = 301,
   [302] = 302,
-  [303] = 303,
+  [303] = 280,
   [304] = 304,
   [305] = 305,
-  [306] = 306,
-  [307] = 307,
-  [308] = 308,
-  [309] = 309,
+  [306] = 263,
+  [307] = 262,
+  [308] = 261,
+  [309] = 260,
   [310] = 310,
-  [311] = 311,
-  [312] = 301,
-  [313] = 313,
-  [314] = 314,
-  [315] = 271,
-  [316] = 316,
-  [317] = 317,
-  [318] = 318,
-  [319] = 300,
-  [320] = 269,
-  [321] = 268,
-  [322] = 260,
-  [323] = 266,
-  [324] = 324,
-  [325] = 294,
-  [326] = 309,
-  [327] = 327,
-  [328] = 270,
-  [329] = 313,
-  [330] = 281,
-  [331] = 331,
+  [311] = 293,
+  [312] = 312,
+  [313] = 305,
+  [314] = 265,
+  [315] = 315,
+  [316] = 264,
+  [317] = 288,
+  [318] = 251,
+  [319] = 297,
 };
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
@@ -3150,12 +3138,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [57] = {.lex_state = 0},
   [58] = {.lex_state = 0},
   [59] = {.lex_state = 0},
-  [60] = {.lex_state = 0},
-  [61] = {.lex_state = 0},
-  [62] = {.lex_state = 0},
-  [63] = {.lex_state = 0},
-  [64] = {.lex_state = 0},
-  [65] = {.lex_state = 0},
+  [60] = {.lex_state = 14},
+  [61] = {.lex_state = 14},
+  [62] = {.lex_state = 14},
+  [63] = {.lex_state = 14},
+  [64] = {.lex_state = 14},
+  [65] = {.lex_state = 14},
   [66] = {.lex_state = 14},
   [67] = {.lex_state = 14},
   [68] = {.lex_state = 14},
@@ -3175,138 +3163,138 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [82] = {.lex_state = 14},
   [83] = {.lex_state = 14},
   [84] = {.lex_state = 14},
-  [85] = {.lex_state = 14},
-  [86] = {.lex_state = 14},
-  [87] = {.lex_state = 14},
-  [88] = {.lex_state = 14},
-  [89] = {.lex_state = 14},
-  [90] = {.lex_state = 14},
-  [91] = {.lex_state = 14},
-  [92] = {.lex_state = 14},
-  [93] = {.lex_state = 14},
-  [94] = {.lex_state = 14},
-  [95] = {.lex_state = 14},
-  [96] = {.lex_state = 14},
+  [85] = {.lex_state = 0},
+  [86] = {.lex_state = 0},
+  [87] = {.lex_state = 0},
+  [88] = {.lex_state = 0},
+  [89] = {.lex_state = 0},
+  [90] = {.lex_state = 0},
+  [91] = {.lex_state = 0},
+  [92] = {.lex_state = 15},
+  [93] = {.lex_state = 15},
+  [94] = {.lex_state = 15},
+  [95] = {.lex_state = 0},
+  [96] = {.lex_state = 15},
   [97] = {.lex_state = 0},
-  [98] = {.lex_state = 0},
+  [98] = {.lex_state = 15},
   [99] = {.lex_state = 0},
   [100] = {.lex_state = 0},
   [101] = {.lex_state = 0},
   [102] = {.lex_state = 0},
   [103] = {.lex_state = 0},
-  [104] = {.lex_state = 15},
+  [104] = {.lex_state = 0},
   [105] = {.lex_state = 0},
-  [106] = {.lex_state = 15},
-  [107] = {.lex_state = 15},
+  [106] = {.lex_state = 16},
+  [107] = {.lex_state = 0},
   [108] = {.lex_state = 0},
-  [109] = {.lex_state = 15},
-  [110] = {.lex_state = 15},
+  [109] = {.lex_state = 16},
+  [110] = {.lex_state = 0},
   [111] = {.lex_state = 0},
-  [112] = {.lex_state = 0},
-  [113] = {.lex_state = 16},
+  [112] = {.lex_state = 13},
+  [113] = {.lex_state = 0},
   [114] = {.lex_state = 0},
   [115] = {.lex_state = 0},
   [116] = {.lex_state = 0},
   [117] = {.lex_state = 0},
-  [118] = {.lex_state = 16},
+  [118] = {.lex_state = 0},
   [119] = {.lex_state = 0},
   [120] = {.lex_state = 0},
   [121] = {.lex_state = 0},
-  [122] = {.lex_state = 0},
+  [122] = {.lex_state = 13},
   [123] = {.lex_state = 0},
   [124] = {.lex_state = 0},
   [125] = {.lex_state = 0},
   [126] = {.lex_state = 0},
-  [127] = {.lex_state = 0},
+  [127] = {.lex_state = 13},
   [128] = {.lex_state = 0},
   [129] = {.lex_state = 0},
-  [130] = {.lex_state = 0},
+  [130] = {.lex_state = 13},
   [131] = {.lex_state = 0},
-  [132] = {.lex_state = 13},
-  [133] = {.lex_state = 0},
-  [134] = {.lex_state = 13},
-  [135] = {.lex_state = 0},
+  [132] = {.lex_state = 0},
+  [133] = {.lex_state = 13},
+  [134] = {.lex_state = 0},
+  [135] = {.lex_state = 13},
   [136] = {.lex_state = 0},
-  [137] = {.lex_state = 0},
-  [138] = {.lex_state = 0},
+  [137] = {.lex_state = 13},
+  [138] = {.lex_state = 15},
   [139] = {.lex_state = 13},
-  [140] = {.lex_state = 0},
+  [140] = {.lex_state = 13},
   [141] = {.lex_state = 0},
   [142] = {.lex_state = 0},
-  [143] = {.lex_state = 13},
-  [144] = {.lex_state = 0},
-  [145] = {.lex_state = 13},
-  [146] = {.lex_state = 13},
-  [147] = {.lex_state = 13},
+  [143] = {.lex_state = 0},
+  [144] = {.lex_state = 13},
+  [145] = {.lex_state = 0},
+  [146] = {.lex_state = 0},
+  [147] = {.lex_state = 0},
   [148] = {.lex_state = 0},
-  [149] = {.lex_state = 15},
-  [150] = {.lex_state = 0},
-  [151] = {.lex_state = 13},
-  [152] = {.lex_state = 0},
+  [149] = {.lex_state = 0},
+  [150] = {.lex_state = 13},
+  [151] = {.lex_state = 0},
+  [152] = {.lex_state = 13},
   [153] = {.lex_state = 0},
-  [154] = {.lex_state = 0},
+  [154] = {.lex_state = 13},
   [155] = {.lex_state = 0},
-  [156] = {.lex_state = 0},
+  [156] = {.lex_state = 13},
   [157] = {.lex_state = 13},
-  [158] = {.lex_state = 0},
+  [158] = {.lex_state = 13},
   [159] = {.lex_state = 13},
-  [160] = {.lex_state = 0},
-  [161] = {.lex_state = 0},
+  [160] = {.lex_state = 13},
+  [161] = {.lex_state = 13},
   [162] = {.lex_state = 0},
   [163] = {.lex_state = 13},
-  [164] = {.lex_state = 13},
-  [165] = {.lex_state = 0},
+  [164] = {.lex_state = 0},
+  [165] = {.lex_state = 13},
   [166] = {.lex_state = 0},
-  [167] = {.lex_state = 0},
-  [168] = {.lex_state = 0},
+  [167] = {.lex_state = 13},
+  [168] = {.lex_state = 13},
   [169] = {.lex_state = 0},
   [170] = {.lex_state = 0},
   [171] = {.lex_state = 13},
-  [172] = {.lex_state = 13},
-  [173] = {.lex_state = 13},
-  [174] = {.lex_state = 13},
-  [175] = {.lex_state = 15},
+  [172] = {.lex_state = 15},
+  [173] = {.lex_state = 0},
+  [174] = {.lex_state = 0},
+  [175] = {.lex_state = 13},
   [176] = {.lex_state = 0},
-  [177] = {.lex_state = 13},
+  [177] = {.lex_state = 0},
   [178] = {.lex_state = 13},
   [179] = {.lex_state = 13},
-  [180] = {.lex_state = 15},
-  [181] = {.lex_state = 13},
-  [182] = {.lex_state = 0},
+  [180] = {.lex_state = 0},
+  [181] = {.lex_state = 0},
+  [182] = {.lex_state = 13},
   [183] = {.lex_state = 0},
-  [184] = {.lex_state = 13},
+  [184] = {.lex_state = 15},
   [185] = {.lex_state = 13},
-  [186] = {.lex_state = 0},
+  [186] = {.lex_state = 13},
   [187] = {.lex_state = 0},
   [188] = {.lex_state = 0},
-  [189] = {.lex_state = 13},
-  [190] = {.lex_state = 0},
-  [191] = {.lex_state = 13},
-  [192] = {.lex_state = 0},
-  [193] = {.lex_state = 13},
+  [189] = {.lex_state = 15},
+  [190] = {.lex_state = 13},
+  [191] = {.lex_state = 0},
+  [192] = {.lex_state = 13},
+  [193] = {.lex_state = 0},
   [194] = {.lex_state = 0},
   [195] = {.lex_state = 0},
-  [196] = {.lex_state = 15},
-  [197] = {.lex_state = 13},
+  [196] = {.lex_state = 0},
+  [197] = {.lex_state = 0},
   [198] = {.lex_state = 0},
   [199] = {.lex_state = 13},
-  [200] = {.lex_state = 13},
-  [201] = {.lex_state = 13},
-  [202] = {.lex_state = 0},
-  [203] = {.lex_state = 0},
-  [204] = {.lex_state = 13},
+  [200] = {.lex_state = 0},
+  [201] = {.lex_state = 0},
+  [202] = {.lex_state = 13},
+  [203] = {.lex_state = 13},
+  [204] = {.lex_state = 0},
   [205] = {.lex_state = 0},
-  [206] = {.lex_state = 0},
+  [206] = {.lex_state = 13},
   [207] = {.lex_state = 0},
-  [208] = {.lex_state = 13},
+  [208] = {.lex_state = 0},
   [209] = {.lex_state = 0},
   [210] = {.lex_state = 0},
   [211] = {.lex_state = 0},
   [212] = {.lex_state = 0},
-  [213] = {.lex_state = 13},
-  [214] = {.lex_state = 13},
-  [215] = {.lex_state = 13},
-  [216] = {.lex_state = 13},
+  [213] = {.lex_state = 0},
+  [214] = {.lex_state = 0},
+  [215] = {.lex_state = 0},
+  [216] = {.lex_state = 0},
   [217] = {.lex_state = 0},
   [218] = {.lex_state = 13},
   [219] = {.lex_state = 0},
@@ -3317,62 +3305,62 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [224] = {.lex_state = 0},
   [225] = {.lex_state = 0},
   [226] = {.lex_state = 0},
-  [227] = {.lex_state = 0},
-  [228] = {.lex_state = 13},
+  [227] = {.lex_state = 13},
+  [228] = {.lex_state = 0},
   [229] = {.lex_state = 13},
   [230] = {.lex_state = 0},
   [231] = {.lex_state = 0},
-  [232] = {.lex_state = 0},
+  [232] = {.lex_state = 13},
   [233] = {.lex_state = 0},
-  [234] = {.lex_state = 0},
+  [234] = {.lex_state = 13},
   [235] = {.lex_state = 13},
-  [236] = {.lex_state = 13},
+  [236] = {.lex_state = 0},
   [237] = {.lex_state = 0},
   [238] = {.lex_state = 13},
   [239] = {.lex_state = 0},
-  [240] = {.lex_state = 0},
+  [240] = {.lex_state = 13},
   [241] = {.lex_state = 13},
   [242] = {.lex_state = 0},
   [243] = {.lex_state = 0},
   [244] = {.lex_state = 0},
   [245] = {.lex_state = 0},
   [246] = {.lex_state = 0},
-  [247] = {.lex_state = 0},
+  [247] = {.lex_state = 13},
   [248] = {.lex_state = 0},
-  [249] = {.lex_state = 13},
-  [250] = {.lex_state = 13},
-  [251] = {.lex_state = 13},
+  [249] = {.lex_state = 0},
+  [250] = {.lex_state = 0},
+  [251] = {.lex_state = 0},
   [252] = {.lex_state = 0},
   [253] = {.lex_state = 0},
-  [254] = {.lex_state = 13},
+  [254] = {.lex_state = 0},
   [255] = {.lex_state = 0},
   [256] = {.lex_state = 0},
-  [257] = {.lex_state = 13},
-  [258] = {.lex_state = 13},
-  [259] = {.lex_state = 0},
+  [257] = {.lex_state = 0},
+  [258] = {.lex_state = 0},
+  [259] = {.lex_state = 13},
   [260] = {.lex_state = 13},
-  [261] = {.lex_state = 0},
-  [262] = {.lex_state = 0},
-  [263] = {.lex_state = 0},
-  [264] = {.lex_state = 0},
-  [265] = {.lex_state = 13},
-  [266] = {.lex_state = 13},
+  [261] = {.lex_state = 13},
+  [262] = {.lex_state = 13},
+  [263] = {.lex_state = 13},
+  [264] = {.lex_state = 13},
+  [265] = {.lex_state = 0},
+  [266] = {.lex_state = 0},
   [267] = {.lex_state = 0},
-  [268] = {.lex_state = 13},
-  [269] = {.lex_state = 13},
-  [270] = {.lex_state = 13},
+  [268] = {.lex_state = 0},
+  [269] = {.lex_state = 0},
+  [270] = {.lex_state = 0},
   [271] = {.lex_state = 0},
-  [272] = {.lex_state = 13},
-  [273] = {.lex_state = 0},
-  [274] = {.lex_state = 0},
+  [272] = {.lex_state = 0},
+  [273] = {.lex_state = 13},
+  [274] = {.lex_state = 13},
   [275] = {.lex_state = 0},
-  [276] = {.lex_state = 0},
+  [276] = {.lex_state = 13},
   [277] = {.lex_state = 0},
   [278] = {.lex_state = 0},
   [279] = {.lex_state = 13},
-  [280] = {.lex_state = 13},
-  [281] = {.lex_state = 0},
-  [282] = {.lex_state = 13},
+  [280] = {.lex_state = 0},
+  [281] = {.lex_state = 13},
+  [282] = {.lex_state = 0},
   [283] = {.lex_state = 0},
   [284] = {.lex_state = 13},
   [285] = {.lex_state = 0},
@@ -3380,16 +3368,16 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [287] = {.lex_state = 0},
   [288] = {.lex_state = 0},
   [289] = {.lex_state = 0},
-  [290] = {.lex_state = 13},
-  [291] = {.lex_state = 0},
+  [290] = {.lex_state = 0},
+  [291] = {.lex_state = 13},
   [292] = {.lex_state = 0},
   [293] = {.lex_state = 0},
-  [294] = {.lex_state = 0},
+  [294] = {.lex_state = 13},
   [295] = {.lex_state = 0},
   [296] = {.lex_state = 0},
   [297] = {.lex_state = 0},
   [298] = {.lex_state = 13},
-  [299] = {.lex_state = 13},
+  [299] = {.lex_state = 0},
   [300] = {.lex_state = 0},
   [301] = {.lex_state = 0},
   [302] = {.lex_state = 0},
@@ -3397,9 +3385,9 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [304] = {.lex_state = 0},
   [305] = {.lex_state = 0},
   [306] = {.lex_state = 13},
-  [307] = {.lex_state = 0},
-  [308] = {.lex_state = 0},
-  [309] = {.lex_state = 0},
+  [307] = {.lex_state = 13},
+  [308] = {.lex_state = 13},
+  [309] = {.lex_state = 13},
   [310] = {.lex_state = 0},
   [311] = {.lex_state = 0},
   [312] = {.lex_state = 0},
@@ -3410,18 +3398,6 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [317] = {.lex_state = 0},
   [318] = {.lex_state = 0},
   [319] = {.lex_state = 0},
-  [320] = {.lex_state = 13},
-  [321] = {.lex_state = 13},
-  [322] = {.lex_state = 13},
-  [323] = {.lex_state = 13},
-  [324] = {.lex_state = 0},
-  [325] = {.lex_state = 0},
-  [326] = {.lex_state = 0},
-  [327] = {.lex_state = 0},
-  [328] = {.lex_state = 13},
-  [329] = {.lex_state = 0},
-  [330] = {.lex_state = 0},
-  [331] = {.lex_state = 0},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -3484,12 +3460,12 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_comment] = ACTIONS(3),
   },
   [1] = {
-    [sym_source_file] = STATE(289),
-    [sym_package_decl] = STATE(98),
-    [sym_toplevel_use_item] = STATE(101),
-    [sym_world_item] = STATE(101),
-    [sym_interface_item] = STATE(101),
-    [aux_sym_source_file_repeat1] = STATE(101),
+    [sym_source_file] = STATE(283),
+    [sym_package_decl] = STATE(85),
+    [sym_toplevel_use_item] = STATE(86),
+    [sym_world_item] = STATE(86),
+    [sym_interface_item] = STATE(86),
+    [aux_sym_source_file_repeat1] = STATE(86),
     [ts_builtin_sym_end] = ACTIONS(5),
     [anon_sym_package] = ACTIONS(7),
     [anon_sym_use] = ACTIONS(9),
@@ -3517,9 +3493,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(317), 1,
+    STATE(266), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3556,11 +3532,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    ACTIONS(31), 1,
-      anon_sym_GT,
-    STATE(252), 1,
+    STATE(188), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(278), 1,
+      sym_tuple_list,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3597,11 +3573,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(187), 1,
+    ACTIONS(31), 1,
+      anon_sym_GT,
+    STATE(242), 1,
       sym_ty,
-    STATE(286), 1,
-      sym_tuple_list,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3639,10 +3615,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(29), 1,
       anon_sym_borrow,
     ACTIONS(33), 1,
-      anon_sym_GT,
-    STATE(252), 1,
+      anon_sym__,
+    STATE(193), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3680,10 +3656,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(29), 1,
       anon_sym_borrow,
     ACTIONS(35), 1,
-      anon_sym__,
-    STATE(207), 1,
+      anon_sym_GT,
+    STATE(242), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3720,9 +3696,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(312), 1,
+    STATE(236), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3759,9 +3735,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(209), 1,
+    STATE(311), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3798,9 +3774,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(318), 1,
+    STATE(255), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3839,7 +3815,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_borrow,
     STATE(293), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3876,9 +3852,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(244), 1,
+    STATE(275), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3915,9 +3891,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(301), 1,
+    STATE(242), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3954,9 +3930,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(285), 1,
+    STATE(267), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -3993,9 +3969,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(252), 1,
+    STATE(277), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -4032,9 +4008,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_result,
     ACTIONS(29), 1,
       anon_sym_borrow,
-    STATE(267), 1,
+    STATE(195), 1,
       sym_ty,
-    STATE(111), 5,
+    STATE(103), 5,
       sym_tuple,
       sym_list,
       sym_option,
@@ -4081,20 +4057,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
     ACTIONS(66), 1,
       anon_sym_resource,
-    STATE(52), 1,
+    STATE(46), 1,
       sym_export_item,
-    STATE(53), 1,
+    STATE(47), 1,
       sym_import_item,
-    STATE(54), 1,
+    STATE(48), 1,
       sym_include_item,
-    STATE(55), 1,
+    STATE(49), 1,
       sym_typedef_item,
-    STATE(56), 1,
+    STATE(50), 1,
       sym_use_item,
     STATE(16), 2,
       sym_world_items,
       aux_sym_world_body_repeat1,
-    STATE(57), 6,
+    STATE(51), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4126,20 +4102,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
     ACTIONS(89), 1,
       anon_sym_resource,
-    STATE(52), 1,
+    STATE(46), 1,
       sym_export_item,
-    STATE(53), 1,
+    STATE(47), 1,
       sym_import_item,
-    STATE(54), 1,
+    STATE(48), 1,
       sym_include_item,
-    STATE(55), 1,
+    STATE(49), 1,
       sym_typedef_item,
-    STATE(56), 1,
+    STATE(50), 1,
       sym_use_item,
     STATE(16), 2,
       sym_world_items,
       aux_sym_world_body_repeat1,
-    STATE(57), 6,
+    STATE(51), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4171,20 +4147,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_resource,
     ACTIONS(91), 1,
       anon_sym_RBRACE,
-    STATE(52), 1,
+    STATE(46), 1,
       sym_export_item,
-    STATE(53), 1,
+    STATE(47), 1,
       sym_import_item,
-    STATE(54), 1,
+    STATE(48), 1,
       sym_include_item,
-    STATE(55), 1,
+    STATE(49), 1,
       sym_typedef_item,
-    STATE(56), 1,
+    STATE(50), 1,
       sym_use_item,
     STATE(17), 2,
       sym_world_items,
       aux_sym_world_body_repeat1,
-    STATE(57), 6,
+    STATE(51), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4196,32 +4172,32 @@ static const uint16_t ts_small_parse_table[] = {
       sym_comment,
     ACTIONS(93), 1,
       anon_sym_use,
-    ACTIONS(95), 1,
+    ACTIONS(96), 1,
       sym_id,
-    ACTIONS(97), 1,
-      anon_sym_RBRACE,
     ACTIONS(99), 1,
-      anon_sym_type,
+      anon_sym_RBRACE,
     ACTIONS(101), 1,
+      anon_sym_type,
+    ACTIONS(104), 1,
       anon_sym_record,
-    ACTIONS(103), 1,
+    ACTIONS(107), 1,
       anon_sym_flags,
-    ACTIONS(105), 1,
+    ACTIONS(110), 1,
       anon_sym_variant,
-    ACTIONS(107), 1,
+    ACTIONS(113), 1,
       anon_sym_enum,
-    ACTIONS(109), 1,
+    ACTIONS(116), 1,
       anon_sym_resource,
-    STATE(91), 1,
+    STATE(69), 1,
       sym_use_item,
-    STATE(92), 1,
+    STATE(71), 1,
       sym_func_item,
-    STATE(96), 1,
+    STATE(72), 1,
       sym_typedef_item,
-    STATE(21), 2,
+    STATE(19), 2,
       sym_interface_items,
       aux_sym_interface_body_repeat1,
-    STATE(86), 6,
+    STATE(75), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4231,34 +4207,34 @@ static const uint16_t ts_small_parse_table[] = {
   [945] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(111), 1,
+    ACTIONS(119), 1,
       anon_sym_use,
-    ACTIONS(114), 1,
+    ACTIONS(121), 1,
       sym_id,
-    ACTIONS(117), 1,
+    ACTIONS(123), 1,
       anon_sym_RBRACE,
-    ACTIONS(119), 1,
+    ACTIONS(125), 1,
       anon_sym_type,
-    ACTIONS(122), 1,
+    ACTIONS(127), 1,
       anon_sym_record,
-    ACTIONS(125), 1,
+    ACTIONS(129), 1,
       anon_sym_flags,
-    ACTIONS(128), 1,
-      anon_sym_variant,
     ACTIONS(131), 1,
+      anon_sym_variant,
+    ACTIONS(133), 1,
       anon_sym_enum,
-    ACTIONS(134), 1,
+    ACTIONS(135), 1,
       anon_sym_resource,
-    STATE(91), 1,
+    STATE(69), 1,
       sym_use_item,
-    STATE(92), 1,
+    STATE(71), 1,
       sym_func_item,
-    STATE(96), 1,
+    STATE(72), 1,
       sym_typedef_item,
-    STATE(20), 2,
+    STATE(21), 2,
       sym_interface_items,
       aux_sym_interface_body_repeat1,
-    STATE(86), 6,
+    STATE(75), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4268,34 +4244,34 @@ static const uint16_t ts_small_parse_table[] = {
   [997] = 15,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(93), 1,
+    ACTIONS(119), 1,
       anon_sym_use,
-    ACTIONS(95), 1,
+    ACTIONS(121), 1,
       sym_id,
-    ACTIONS(99), 1,
+    ACTIONS(125), 1,
       anon_sym_type,
-    ACTIONS(101), 1,
+    ACTIONS(127), 1,
       anon_sym_record,
-    ACTIONS(103), 1,
+    ACTIONS(129), 1,
       anon_sym_flags,
-    ACTIONS(105), 1,
+    ACTIONS(131), 1,
       anon_sym_variant,
-    ACTIONS(107), 1,
+    ACTIONS(133), 1,
       anon_sym_enum,
-    ACTIONS(109), 1,
+    ACTIONS(135), 1,
       anon_sym_resource,
     ACTIONS(137), 1,
       anon_sym_RBRACE,
-    STATE(91), 1,
+    STATE(69), 1,
       sym_use_item,
-    STATE(92), 1,
+    STATE(71), 1,
       sym_func_item,
-    STATE(96), 1,
+    STATE(72), 1,
       sym_typedef_item,
-    STATE(20), 2,
+    STATE(19), 2,
       sym_interface_items,
       aux_sym_interface_body_repeat1,
-    STATE(86), 6,
+    STATE(75), 6,
       sym_type_item,
       sym_record_item,
       sym_flags_items,
@@ -4327,7 +4303,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_SEMI,
     ACTIONS(145), 1,
       anon_sym_LBRACE,
-    STATE(45), 1,
+    STATE(29), 1,
       sym_resource_body,
     ACTIONS(143), 11,
       anon_sym_use,
@@ -4368,7 +4344,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_SEMI,
     ACTIONS(153), 1,
       anon_sym_LBRACE,
-    STATE(84), 1,
+    STATE(79), 1,
       sym_resource_body,
     ACTIONS(151), 8,
       anon_sym_use,
@@ -4889,90 +4865,84 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1719] = 2,
+  [1719] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(223), 11,
-      anon_sym_use,
+    ACTIONS(175), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(223), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1736] = 2,
+  [1736] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 11,
-      anon_sym_use,
+    ACTIONS(157), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(225), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1753] = 2,
+  [1753] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(227), 11,
-      anon_sym_use,
+    ACTIONS(207), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(227), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1770] = 2,
+  [1770] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(229), 11,
-      anon_sym_use,
+    ACTIONS(231), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(229), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1787] = 2,
+  [1787] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(231), 11,
-      anon_sym_use,
+    ACTIONS(209), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(233), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [1804] = 2,
+  [1804] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(233), 11,
-      anon_sym_use,
+    ACTIONS(211), 1,
       anon_sym_RBRACE,
-      anon_sym_export,
-      anon_sym_import,
-      anon_sym_include,
+    ACTIONS(235), 8,
+      anon_sym_use,
+      sym_id,
       anon_sym_type,
       anon_sym_record,
       anon_sym_flags,
@@ -4982,9 +4952,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1821] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(231), 1,
+    ACTIONS(219), 1,
       anon_sym_RBRACE,
-    ACTIONS(235), 8,
+    ACTIONS(237), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -4996,9 +4966,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1838] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(195), 1,
+    ACTIONS(177), 1,
       anon_sym_RBRACE,
-    ACTIONS(237), 8,
+    ACTIONS(239), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5010,9 +4980,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1855] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(241), 1,
+    ACTIONS(179), 1,
       anon_sym_RBRACE,
-    ACTIONS(239), 8,
+    ACTIONS(241), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5024,7 +4994,7 @@ static const uint16_t ts_small_parse_table[] = {
   [1872] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(181), 1,
+    ACTIONS(245), 1,
       anon_sym_RBRACE,
     ACTIONS(243), 8,
       anon_sym_use,
@@ -5038,9 +5008,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1889] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(233), 1,
+    ACTIONS(189), 1,
       anon_sym_RBRACE,
-    ACTIONS(245), 8,
+    ACTIONS(247), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5052,9 +5022,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1906] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(157), 1,
+    ACTIONS(251), 1,
       anon_sym_RBRACE,
-    ACTIONS(247), 8,
+    ACTIONS(249), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5066,9 +5036,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1923] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(177), 1,
+    ACTIONS(255), 1,
       anon_sym_RBRACE,
-    ACTIONS(249), 8,
+    ACTIONS(253), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5080,9 +5050,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1940] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(175), 1,
+    ACTIONS(191), 1,
       anon_sym_RBRACE,
-    ACTIONS(251), 8,
+    ACTIONS(257), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5094,9 +5064,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1957] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(173), 1,
+    ACTIONS(155), 1,
       anon_sym_RBRACE,
-    ACTIONS(253), 8,
+    ACTIONS(259), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5108,9 +5078,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1974] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(229), 1,
+    ACTIONS(205), 1,
       anon_sym_RBRACE,
-    ACTIONS(255), 8,
+    ACTIONS(261), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5122,9 +5092,9 @@ static const uint16_t ts_small_parse_table[] = {
   [1991] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(169), 1,
+    ACTIONS(213), 1,
       anon_sym_RBRACE,
-    ACTIONS(257), 8,
+    ACTIONS(263), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5136,9 +5106,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2008] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(161), 1,
+    ACTIONS(215), 1,
       anon_sym_RBRACE,
-    ACTIONS(259), 8,
+    ACTIONS(265), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5150,9 +5120,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2025] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(191), 1,
+    ACTIONS(169), 1,
       anon_sym_RBRACE,
-    ACTIONS(261), 8,
+    ACTIONS(267), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5164,9 +5134,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2042] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(163), 1,
+    ACTIONS(161), 1,
       anon_sym_RBRACE,
-    ACTIONS(263), 8,
+    ACTIONS(269), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5178,9 +5148,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2059] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(165), 1,
+    ACTIONS(159), 1,
       anon_sym_RBRACE,
-    ACTIONS(265), 8,
+    ACTIONS(271), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5192,9 +5162,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2076] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(167), 1,
+    ACTIONS(171), 1,
       anon_sym_RBRACE,
-    ACTIONS(267), 8,
+    ACTIONS(273), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5206,9 +5176,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2093] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(171), 1,
+    ACTIONS(167), 1,
       anon_sym_RBRACE,
-    ACTIONS(269), 8,
+    ACTIONS(275), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5220,9 +5190,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2110] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(197), 1,
+    ACTIONS(165), 1,
       anon_sym_RBRACE,
-    ACTIONS(271), 8,
+    ACTIONS(277), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5234,9 +5204,9 @@ static const uint16_t ts_small_parse_table[] = {
   [2127] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(193), 1,
+    ACTIONS(163), 1,
       anon_sym_RBRACE,
-    ACTIONS(273), 8,
+    ACTIONS(279), 8,
       anon_sym_use,
       sym_id,
       anon_sym_type,
@@ -5245,1949 +5215,1769 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_variant,
       anon_sym_enum,
       anon_sym_resource,
-  [2144] = 3,
+  [2144] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(201), 1,
-      anon_sym_RBRACE,
-    ACTIONS(275), 8,
+    ACTIONS(9), 1,
       anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2161] = 3,
+    ACTIONS(11), 1,
+      anon_sym_world,
+    ACTIONS(13), 1,
+      anon_sym_interface,
+    ACTIONS(281), 1,
+      ts_builtin_sym_end,
+    STATE(87), 4,
+      sym_toplevel_use_item,
+      sym_world_item,
+      sym_interface_item,
+      aux_sym_source_file_repeat1,
+  [2166] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(217), 1,
-      anon_sym_RBRACE,
-    ACTIONS(277), 8,
+    ACTIONS(9), 1,
       anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2178] = 3,
+    ACTIONS(11), 1,
+      anon_sym_world,
+    ACTIONS(13), 1,
+      anon_sym_interface,
+    ACTIONS(281), 1,
+      ts_builtin_sym_end,
+    STATE(88), 4,
+      sym_toplevel_use_item,
+      sym_world_item,
+      sym_interface_item,
+      aux_sym_source_file_repeat1,
+  [2188] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(185), 1,
-      anon_sym_RBRACE,
-    ACTIONS(279), 8,
+    ACTIONS(9), 1,
       anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2195] = 3,
+    ACTIONS(11), 1,
+      anon_sym_world,
+    ACTIONS(13), 1,
+      anon_sym_interface,
+    ACTIONS(283), 1,
+      ts_builtin_sym_end,
+    STATE(88), 4,
+      sym_toplevel_use_item,
+      sym_world_item,
+      sym_interface_item,
+      aux_sym_source_file_repeat1,
+  [2210] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(155), 1,
-      anon_sym_RBRACE,
-    ACTIONS(281), 8,
+    ACTIONS(285), 1,
+      ts_builtin_sym_end,
+    ACTIONS(287), 1,
       anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2212] = 3,
+    ACTIONS(290), 1,
+      anon_sym_world,
+    ACTIONS(293), 1,
+      anon_sym_interface,
+    STATE(88), 4,
+      sym_toplevel_use_item,
+      sym_world_item,
+      sym_interface_item,
+      aux_sym_source_file_repeat1,
+  [2232] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(199), 1,
-      anon_sym_RBRACE,
-    ACTIONS(283), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2229] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(203), 1,
-      anon_sym_RBRACE,
-    ACTIONS(285), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2246] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(289), 1,
-      anon_sym_RBRACE,
-    ACTIONS(287), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2263] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(293), 1,
-      anon_sym_RBRACE,
-    ACTIONS(291), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2280] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(219), 1,
-      anon_sym_RBRACE,
-    ACTIONS(295), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2297] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(205), 1,
-      anon_sym_RBRACE,
-    ACTIONS(297), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2314] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(227), 1,
-      anon_sym_RBRACE,
-    ACTIONS(299), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2331] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(303), 1,
-      anon_sym_RBRACE,
-    ACTIONS(301), 8,
-      anon_sym_use,
-      sym_id,
-      anon_sym_type,
-      anon_sym_record,
-      anon_sym_flags,
-      anon_sym_variant,
-      anon_sym_enum,
-      anon_sym_resource,
-  [2348] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(305), 1,
+    ACTIONS(296), 1,
       anon_sym_COLON,
-    ACTIONS(307), 1,
+    ACTIONS(298), 1,
       anon_sym_SLASH,
-    ACTIONS(309), 1,
+    ACTIONS(300), 1,
       anon_sym_AT,
-    STATE(102), 1,
+    STATE(90), 1,
       aux_sym_package_decl_repeat2,
-    ACTIONS(311), 4,
+    ACTIONS(302), 4,
       anon_sym_SEMI,
       anon_sym_as,
       anon_sym_with,
       anon_sym_DOT,
-  [2370] = 6,
+  [2254] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(9), 1,
-      anon_sym_use,
-    ACTIONS(11), 1,
-      anon_sym_world,
-    ACTIONS(13), 1,
-      anon_sym_interface,
-    ACTIONS(313), 1,
-      ts_builtin_sym_end,
-    STATE(99), 4,
-      sym_toplevel_use_item,
-      sym_world_item,
-      sym_interface_item,
-      aux_sym_source_file_repeat1,
-  [2392] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(9), 1,
-      anon_sym_use,
-    ACTIONS(11), 1,
-      anon_sym_world,
-    ACTIONS(13), 1,
-      anon_sym_interface,
-    ACTIONS(315), 1,
-      ts_builtin_sym_end,
-    STATE(100), 4,
-      sym_toplevel_use_item,
-      sym_world_item,
-      sym_interface_item,
-      aux_sym_source_file_repeat1,
-  [2414] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(317), 1,
-      ts_builtin_sym_end,
-    ACTIONS(319), 1,
-      anon_sym_use,
-    ACTIONS(322), 1,
-      anon_sym_world,
-    ACTIONS(325), 1,
-      anon_sym_interface,
-    STATE(100), 4,
-      sym_toplevel_use_item,
-      sym_world_item,
-      sym_interface_item,
-      aux_sym_source_file_repeat1,
-  [2436] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(9), 1,
-      anon_sym_use,
-    ACTIONS(11), 1,
-      anon_sym_world,
-    ACTIONS(13), 1,
-      anon_sym_interface,
-    ACTIONS(313), 1,
-      ts_builtin_sym_end,
-    STATE(100), 4,
-      sym_toplevel_use_item,
-      sym_world_item,
-      sym_interface_item,
-      aux_sym_source_file_repeat1,
-  [2458] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(307), 1,
+    ACTIONS(298), 1,
       anon_sym_SLASH,
-    ACTIONS(328), 1,
+    ACTIONS(304), 1,
       anon_sym_AT,
-    STATE(103), 1,
+    STATE(91), 1,
       aux_sym_package_decl_repeat2,
-    ACTIONS(330), 4,
+    ACTIONS(306), 4,
       anon_sym_SEMI,
       anon_sym_as,
       anon_sym_with,
       anon_sym_DOT,
-  [2477] = 4,
+  [2273] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(332), 1,
+    ACTIONS(308), 1,
       anon_sym_SLASH,
-    STATE(103), 1,
+    STATE(91), 1,
       aux_sym_package_decl_repeat2,
-    ACTIONS(335), 5,
+    ACTIONS(311), 5,
       anon_sym_AT,
       anon_sym_SEMI,
       anon_sym_as,
       anon_sym_with,
       anon_sym_DOT,
-  [2494] = 6,
+  [2290] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(337), 1,
+    ACTIONS(313), 1,
       sym_id,
-    ACTIONS(339), 1,
+    ACTIONS(316), 1,
       anon_sym_RBRACE,
-    ACTIONS(341), 1,
+    ACTIONS(318), 1,
       anon_sym_constructor,
-    STATE(149), 1,
+    STATE(138), 1,
       sym_func_item,
-    STATE(109), 2,
+    STATE(92), 2,
       sym_resource_method,
       aux_sym_resource_body_repeat1,
-  [2514] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(343), 1,
-      anon_sym_SLASH,
-    ACTIONS(335), 5,
-      anon_sym_AT,
-      anon_sym_SEMI,
-      anon_sym_as,
-      anon_sym_with,
-      anon_sym_DOT,
-  [2528] = 6,
+  [2310] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(337), 1,
+    ACTIONS(321), 1,
       sym_id,
-    ACTIONS(341), 1,
-      anon_sym_constructor,
-    ACTIONS(345), 1,
+    ACTIONS(323), 1,
       anon_sym_RBRACE,
-    STATE(149), 1,
+    ACTIONS(325), 1,
+      anon_sym_constructor,
+    STATE(138), 1,
       sym_func_item,
-    STATE(110), 2,
+    STATE(92), 2,
       sym_resource_method,
       aux_sym_resource_body_repeat1,
-  [2548] = 6,
+  [2330] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(337), 1,
+    ACTIONS(321), 1,
       sym_id,
-    ACTIONS(341), 1,
+    ACTIONS(325), 1,
       anon_sym_constructor,
-    ACTIONS(347), 1,
+    ACTIONS(327), 1,
       anon_sym_RBRACE,
-    STATE(149), 1,
+    STATE(138), 1,
       sym_func_item,
-    STATE(106), 2,
+    STATE(92), 2,
       sym_resource_method,
       aux_sym_resource_body_repeat1,
-  [2568] = 3,
+  [2350] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(331), 1,
       anon_sym_LT,
-    ACTIONS(349), 5,
+    ACTIONS(329), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2582] = 6,
+  [2364] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(337), 1,
+    ACTIONS(321), 1,
       sym_id,
-    ACTIONS(341), 1,
+    ACTIONS(325), 1,
       anon_sym_constructor,
-    ACTIONS(353), 1,
+    ACTIONS(333), 1,
       anon_sym_RBRACE,
-    STATE(149), 1,
+    STATE(138), 1,
       sym_func_item,
-    STATE(110), 2,
+    STATE(94), 2,
       sym_resource_method,
       aux_sym_resource_body_repeat1,
-  [2602] = 6,
+  [2384] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(355), 1,
+    ACTIONS(335), 1,
+      anon_sym_SLASH,
+    ACTIONS(311), 5,
+      anon_sym_AT,
+      anon_sym_SEMI,
+      anon_sym_as,
+      anon_sym_with,
+      anon_sym_DOT,
+  [2398] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(321), 1,
       sym_id,
-    ACTIONS(358), 1,
-      anon_sym_RBRACE,
-    ACTIONS(360), 1,
+    ACTIONS(325), 1,
       anon_sym_constructor,
-    STATE(149), 1,
+    ACTIONS(337), 1,
+      anon_sym_RBRACE,
+    STATE(138), 1,
       sym_func_item,
-    STATE(110), 2,
+    STATE(93), 2,
       sym_resource_method,
       aux_sym_resource_body_repeat1,
-  [2622] = 2,
+  [2418] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(363), 5,
+    ACTIONS(339), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2633] = 2,
+  [2429] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(365), 5,
+    ACTIONS(341), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2644] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(367), 1,
-      sym_id,
-    ACTIONS(369), 1,
-      anon_sym_interface,
-    ACTIONS(371), 1,
-      anon_sym_func,
-    STATE(42), 1,
-      sym_extern_type,
-    STATE(302), 1,
-      sym_func_type,
-  [2663] = 2,
+  [2440] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(373), 5,
+    ACTIONS(343), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2674] = 2,
+  [2451] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(375), 5,
+    ACTIONS(296), 1,
+      anon_sym_COLON,
+    ACTIONS(298), 1,
+      anon_sym_SLASH,
+    ACTIONS(345), 1,
+      anon_sym_AT,
+    ACTIONS(347), 1,
+      anon_sym_SEMI,
+    STATE(119), 1,
+      aux_sym_package_decl_repeat2,
+  [2470] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(349), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2685] = 2,
+  [2481] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(363), 5,
+    ACTIONS(349), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2696] = 3,
+  [2492] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(305), 1,
-      anon_sym_COLON,
-    ACTIONS(377), 4,
+    ACTIONS(351), 5,
       anon_sym_SEMI,
-      anon_sym_as,
-      anon_sym_with,
-      anon_sym_DOT,
-  [2709] = 6,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_GT,
+  [2503] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(367), 1,
+    ACTIONS(353), 1,
       sym_id,
-    ACTIONS(369), 1,
+    ACTIONS(355), 1,
       anon_sym_interface,
-    ACTIONS(371), 1,
+    ACTIONS(357), 1,
       anon_sym_func,
-    STATE(40), 1,
+    STATE(57), 1,
       sym_extern_type,
-    STATE(302), 1,
+    STATE(295), 1,
       sym_func_type,
-  [2728] = 2,
+  [2522] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(379), 5,
+    ACTIONS(359), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2739] = 6,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(305), 1,
-      anon_sym_COLON,
-    ACTIONS(307), 1,
-      anon_sym_SLASH,
-    ACTIONS(381), 1,
-      anon_sym_AT,
-    ACTIONS(383), 1,
-      anon_sym_SEMI,
-    STATE(125), 1,
-      aux_sym_package_decl_repeat2,
-  [2758] = 2,
+  [2533] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(385), 5,
+    ACTIONS(361), 5,
       anon_sym_SEMI,
       anon_sym_RBRACE,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_GT,
-  [2769] = 2,
+  [2544] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(387), 5,
+    ACTIONS(353), 1,
+      sym_id,
+    ACTIONS(355), 1,
+      anon_sym_interface,
+    ACTIONS(357), 1,
+      anon_sym_func,
+    STATE(59), 1,
+      sym_extern_type,
+    STATE(295), 1,
+      sym_func_type,
+  [2563] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(296), 1,
+      anon_sym_COLON,
+    ACTIONS(363), 4,
       anon_sym_SEMI,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
+      anon_sym_as,
+      anon_sym_with,
+      anon_sym_DOT,
+  [2576] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(365), 4,
+      anon_sym_SEMI,
+      anon_sym_as,
+      anon_sym_with,
+      anon_sym_DOT,
+  [2586] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(367), 1,
+      sym_id,
+    ACTIONS(369), 1,
       anon_sym_RPAREN,
-      anon_sym_GT,
-  [2780] = 2,
+    STATE(177), 1,
+      sym_named_type,
+    STATE(249), 1,
+      sym_named_type_list,
+  [2602] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(389), 4,
+    ACTIONS(371), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2790] = 2,
+  [2612] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(391), 4,
+    ACTIONS(373), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2800] = 5,
+  [2622] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(307), 1,
-      anon_sym_SLASH,
-    ACTIONS(393), 1,
-      anon_sym_AT,
-    ACTIONS(395), 1,
-      anon_sym_SEMI,
-    STATE(103), 1,
-      aux_sym_package_decl_repeat2,
-  [2816] = 2,
+    ACTIONS(375), 4,
+      ts_builtin_sym_end,
+      anon_sym_use,
+      anon_sym_world,
+      anon_sym_interface,
+  [2632] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(397), 4,
+    ACTIONS(377), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2826] = 2,
+  [2642] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(399), 4,
+    ACTIONS(379), 4,
       anon_sym_SEMI,
       anon_sym_as,
       anon_sym_with,
       anon_sym_DOT,
-  [2836] = 2,
+  [2652] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(401), 4,
+    ACTIONS(381), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2846] = 2,
+  [2662] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(403), 4,
-      ts_builtin_sym_end,
-      anon_sym_use,
-      anon_sym_world,
-      anon_sym_interface,
-  [2856] = 2,
+    ACTIONS(298), 1,
+      anon_sym_SLASH,
+    ACTIONS(383), 1,
+      anon_sym_AT,
+    ACTIONS(385), 1,
+      anon_sym_SEMI,
+    STATE(91), 1,
+      aux_sym_package_decl_repeat2,
+  [2678] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(405), 4,
+    ACTIONS(387), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2866] = 2,
+  [2688] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(407), 4,
+    ACTIONS(389), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2876] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(409), 1,
-      sym_id,
-    ACTIONS(411), 1,
-      anon_sym_RPAREN,
-    STATE(176), 1,
-      sym_named_type,
-    STATE(291), 1,
-      sym_named_type_list,
-  [2892] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(413), 4,
-      anon_sym_SEMI,
-      anon_sym_as,
-      anon_sym_with,
-      anon_sym_DOT,
-  [2902] = 5,
+  [2698] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(409), 1,
+    ACTIONS(367), 1,
       sym_id,
-    ACTIONS(415), 1,
+    ACTIONS(391), 1,
       anon_sym_RPAREN,
-    STATE(176), 1,
+    STATE(177), 1,
       sym_named_type,
-    STATE(275), 1,
+    STATE(287), 1,
       sym_named_type_list,
-  [2918] = 2,
+  [2714] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(417), 4,
+    ACTIONS(393), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2928] = 2,
+  [2724] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(419), 4,
+    ACTIONS(395), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2938] = 2,
+  [2734] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(421), 4,
+    ACTIONS(397), 4,
       ts_builtin_sym_end,
       anon_sym_use,
       anon_sym_world,
       anon_sym_interface,
-  [2948] = 4,
+  [2744] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(423), 1,
+    ACTIONS(399), 1,
       anon_sym_RBRACE,
-    ACTIONS(425), 1,
+    ACTIONS(401), 1,
       anon_sym_COMMA,
-    STATE(192), 1,
-      aux_sym_variant_body_repeat1,
-  [2961] = 4,
+    STATE(181), 1,
+      aux_sym_record_body_repeat1,
+  [2757] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
+    ACTIONS(403), 1,
       sym_id,
-    ACTIONS(429), 1,
+    ACTIONS(405), 1,
       anon_sym_RBRACE,
-    STATE(155), 1,
-      sym_record_field,
-  [2974] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(431), 1,
-      anon_sym_SEMI,
-    ACTIONS(433), 1,
-      anon_sym_DASH_GT,
-    STATE(273), 1,
-      sym_result_list,
-  [2987] = 4,
+    STATE(221), 1,
+      sym_use_names_item,
+  [2770] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(435), 1,
+    ACTIONS(407), 1,
       anon_sym_RBRACE,
-    ACTIONS(437), 1,
+    ACTIONS(409), 1,
       anon_sym_COMMA,
-    STATE(168), 1,
+    STATE(162), 1,
       aux_sym_flags_body_repeat1,
-  [3000] = 3,
+  [2783] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(439), 1,
-      anon_sym_as,
-    ACTIONS(441), 2,
+    ACTIONS(413), 1,
+      anon_sym_LPAREN,
+    ACTIONS(411), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [3011] = 4,
+  [2794] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(443), 1,
+    ACTIONS(415), 1,
       sym_id,
-    STATE(254), 1,
+    STATE(203), 1,
       aux_sym_package_decl_repeat1,
-    STATE(330), 1,
+    STATE(318), 1,
       sym_use_path,
-  [3024] = 4,
+  [2807] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(445), 1,
+    ACTIONS(417), 1,
       anon_sym_RBRACE,
-    ACTIONS(447), 1,
+    ACTIONS(419), 1,
       anon_sym_COMMA,
-    STATE(182), 1,
-      aux_sym_use_names_list_repeat1,
-  [3037] = 4,
+    STATE(166), 1,
+      aux_sym_variant_cases_repeat1,
+  [2820] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
+    ACTIONS(421), 1,
+      anon_sym_COMMA,
+    ACTIONS(424), 1,
+      anon_sym_GT,
+    STATE(132), 1,
+      aux_sym_tuple_list_repeat1,
+  [2833] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(403), 1,
       sym_id,
-    STATE(144), 1,
+    STATE(145), 1,
       sym_use_names_item,
-    STATE(325), 1,
+    STATE(313), 1,
       sym_use_names_list,
-  [3050] = 4,
+  [2846] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(443), 1,
-      sym_id,
-    STATE(253), 1,
-      sym_use_path,
-    STATE(254), 1,
-      aux_sym_package_decl_repeat1,
-  [3063] = 4,
+    ACTIONS(426), 1,
+      anon_sym_RBRACE,
+    ACTIONS(428), 1,
+      anon_sym_COMMA,
+    STATE(169), 1,
+      aux_sym_enum_cases_repeat1,
+  [2859] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(451), 1,
+    ACTIONS(430), 1,
       sym_id,
-    ACTIONS(453), 1,
-      anon_sym_RBRACE,
-    STATE(217), 1,
-      sym_variant_case,
-  [3076] = 4,
+    STATE(134), 1,
+      sym_enum_case,
+    STATE(297), 1,
+      sym_enum_cases,
+  [2872] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(455), 1,
-      anon_sym_RBRACE,
-    ACTIONS(457), 1,
+    ACTIONS(432), 1,
       anon_sym_COMMA,
-    STATE(186), 1,
-      aux_sym_include_names_list_repeat1,
-  [3089] = 3,
+    ACTIONS(435), 1,
+      anon_sym_RPAREN,
+    STATE(136), 1,
+      aux_sym_named_type_list_repeat1,
+  [2885] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(461), 1,
-      anon_sym_RBRACE,
-    ACTIONS(459), 2,
+    ACTIONS(367), 1,
       sym_id,
-      anon_sym_constructor,
-  [3100] = 4,
+    ACTIONS(437), 1,
+      anon_sym_RPAREN,
+    STATE(237), 1,
+      sym_named_type,
+  [2898] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(463), 1,
+    ACTIONS(441), 1,
       anon_sym_RBRACE,
-    ACTIONS(465), 1,
-      anon_sym_COMMA,
-    STATE(138), 1,
-      aux_sym_variant_body_repeat1,
-  [3113] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(427), 1,
+    ACTIONS(439), 2,
       sym_id,
-    ACTIONS(467), 1,
-      anon_sym_RBRACE,
-    STATE(211), 1,
-      sym_record_field,
-  [3126] = 3,
+      anon_sym_constructor,
+  [2909] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(471), 1,
-      anon_sym_LPAREN,
-    ACTIONS(469), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [3137] = 4,
+    ACTIONS(443), 1,
+      sym_id,
+    STATE(131), 1,
+      sym_variant_case,
+    STATE(296), 1,
+      sym_variant_cases,
+  [2922] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(473), 1,
-      anon_sym_RBRACE,
-    ACTIONS(475), 1,
-      anon_sym_COMMA,
-    STATE(202), 1,
-      aux_sym_flags_body_repeat1,
-  [3150] = 4,
+    ACTIONS(415), 1,
+      sym_id,
+    STATE(203), 1,
+      aux_sym_package_decl_repeat1,
+    STATE(204), 1,
+      sym_use_path,
+  [2935] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(477), 1,
-      anon_sym_RBRACE,
-    ACTIONS(479), 1,
-      anon_sym_COMMA,
-    STATE(161), 1,
-      aux_sym_flags_body_repeat1,
-  [3163] = 4,
+    ACTIONS(445), 1,
+      anon_sym_SEMI,
+    ACTIONS(447), 1,
+      anon_sym_DASH_GT,
+    STATE(285), 1,
+      sym_result_list,
+  [2948] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(481), 1,
-      anon_sym_RBRACE,
-    ACTIONS(483), 1,
+    ACTIONS(35), 1,
+      anon_sym_GT,
+    ACTIONS(449), 1,
       anon_sym_COMMA,
-    STATE(158), 1,
-      aux_sym_record_body_repeat1,
-  [3176] = 4,
+    STATE(132), 1,
+      aux_sym_tuple_list_repeat1,
+  [2961] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(485), 1,
+    ACTIONS(451), 1,
+      anon_sym_as,
+    ACTIONS(453), 2,
       anon_sym_RBRACE,
-    ACTIONS(487), 1,
       anon_sym_COMMA,
-    STATE(192), 1,
-      aux_sym_variant_body_repeat1,
-  [3189] = 4,
+  [2972] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
+    ACTIONS(455), 1,
       sym_id,
-    ACTIONS(489), 1,
+    ACTIONS(457), 1,
       anon_sym_RBRACE,
-    STATE(211), 1,
+    STATE(197), 1,
       sym_record_field,
-  [3202] = 4,
+  [2985] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(489), 1,
+    ACTIONS(459), 1,
       anon_sym_RBRACE,
-    ACTIONS(491), 1,
+    ACTIONS(461), 1,
       anon_sym_COMMA,
-    STATE(198), 1,
-      aux_sym_record_body_repeat1,
-  [3215] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(451), 1,
-      sym_id,
-    ACTIONS(485), 1,
-      anon_sym_RBRACE,
-    STATE(217), 1,
-      sym_variant_case,
-  [3228] = 4,
+    STATE(183), 1,
+      aux_sym_use_names_list_repeat1,
+  [2998] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(493), 1,
+    ACTIONS(463), 1,
       anon_sym_RBRACE,
-    ACTIONS(495), 1,
+    ACTIONS(465), 1,
       anon_sym_COMMA,
-    STATE(202), 1,
+    STATE(180), 1,
       aux_sym_flags_body_repeat1,
-  [3241] = 4,
+  [3011] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(497), 1,
+    ACTIONS(467), 1,
       anon_sym_RBRACE,
-    ACTIONS(499), 1,
+    ACTIONS(469), 1,
       anon_sym_COMMA,
-    STATE(202), 1,
-      aux_sym_flags_body_repeat1,
-  [3254] = 4,
+    STATE(147), 1,
+      aux_sym_include_names_list_repeat1,
+  [3024] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(501), 1,
+    ACTIONS(472), 1,
       anon_sym_RBRACE,
-    ACTIONS(503), 1,
+    ACTIONS(474), 1,
       anon_sym_COMMA,
-    STATE(198), 1,
+    STATE(181), 1,
       aux_sym_record_body_repeat1,
-  [3267] = 4,
+  [3037] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
-      sym_id,
-    ACTIONS(501), 1,
+    ACTIONS(476), 1,
       anon_sym_RBRACE,
-    STATE(211), 1,
-      sym_record_field,
-  [3280] = 4,
+    ACTIONS(478), 1,
+      anon_sym_COMMA,
+    STATE(187), 1,
+      aux_sym_include_names_list_repeat1,
+  [3050] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(423), 1,
-      anon_sym_RBRACE,
-    ACTIONS(451), 1,
+    ACTIONS(455), 1,
       sym_id,
-    STATE(217), 1,
-      sym_variant_case,
-  [3293] = 4,
+    ACTIONS(472), 1,
+      anon_sym_RBRACE,
+    STATE(197), 1,
+      sym_record_field,
+  [3063] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(505), 1,
+    ACTIONS(480), 1,
       anon_sym_RBRACE,
-    ACTIONS(507), 1,
+    ACTIONS(482), 1,
       anon_sym_COMMA,
-    STATE(153), 1,
+    STATE(146), 1,
       aux_sym_flags_body_repeat1,
-  [3306] = 4,
+  [3076] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(509), 1,
-      anon_sym_RBRACE,
-    ACTIONS(511), 1,
-      anon_sym_COMMA,
-    STATE(156), 1,
-      aux_sym_variant_body_repeat1,
-  [3319] = 4,
+    ACTIONS(484), 1,
+      sym_id,
+    STATE(149), 1,
+      sym_include_names_item,
+    STATE(301), 1,
+      sym_include_names_list,
+  [3089] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(513), 1,
+    ACTIONS(486), 1,
       anon_sym_RBRACE,
-    ACTIONS(515), 1,
+    ACTIONS(488), 1,
       anon_sym_COMMA,
-    STATE(160), 1,
-      aux_sym_flags_body_repeat1,
-  [3332] = 4,
+    STATE(148), 1,
+      aux_sym_record_body_repeat1,
+  [3102] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(517), 1,
+    ACTIONS(484), 1,
+      sym_id,
+    ACTIONS(490), 1,
       anon_sym_RBRACE,
-    ACTIONS(519), 1,
-      anon_sym_COMMA,
-    STATE(202), 1,
-      aux_sym_flags_body_repeat1,
-  [3345] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(521), 1,
-      anon_sym_func,
-    ACTIONS(523), 1,
-      anon_sym_static,
-    STATE(300), 1,
-      sym_func_type,
-  [3358] = 4,
+    STATE(225), 1,
+      sym_include_names_item,
+  [3115] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(525), 1,
+    ACTIONS(492), 1,
       anon_sym_RBRACE,
-    ACTIONS(527), 1,
+    ACTIONS(494), 1,
       anon_sym_COMMA,
-    STATE(162), 1,
-      aux_sym_record_body_repeat1,
-  [3371] = 4,
+    STATE(155), 1,
+      aux_sym_use_names_list_repeat1,
+  [3128] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(529), 1,
+    ACTIONS(403), 1,
       sym_id,
-    STATE(148), 1,
-      sym_include_names_item,
-    STATE(324), 1,
-      sym_include_names_list,
-  [3384] = 4,
+    STATE(145), 1,
+      sym_use_names_item,
+    STATE(305), 1,
+      sym_use_names_list,
+  [3141] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(451), 1,
+    ACTIONS(455), 1,
       sym_id,
-    ACTIONS(531), 1,
+    ACTIONS(497), 1,
       anon_sym_RBRACE,
-    STATE(166), 1,
-      sym_variant_case,
-  [3397] = 4,
+    STATE(153), 1,
+      sym_record_field,
+  [3154] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
-      sym_id,
-    ACTIONS(533), 1,
+    ACTIONS(399), 1,
       anon_sym_RBRACE,
-    STATE(170), 1,
+    ACTIONS(455), 1,
+      sym_id,
+    STATE(197), 1,
       sym_record_field,
-  [3410] = 4,
+  [3167] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(443), 1,
+    ACTIONS(499), 1,
       sym_id,
-    STATE(254), 1,
+    STATE(203), 1,
       aux_sym_package_decl_repeat1,
-    STATE(281), 1,
+    STATE(245), 1,
       sym_use_path,
-  [3423] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(241), 1,
-      anon_sym_RBRACE,
-    ACTIONS(239), 2,
-      sym_id,
-      anon_sym_constructor,
-  [3434] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(535), 1,
-      anon_sym_COMMA,
-    ACTIONS(537), 1,
-      anon_sym_RPAREN,
-    STATE(203), 1,
-      aux_sym_named_type_list_repeat1,
-  [3447] = 4,
+  [3180] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(539), 1,
+    ACTIONS(430), 1,
       sym_id,
-    STATE(254), 1,
-      aux_sym_package_decl_repeat1,
-    STATE(287), 1,
-      sym_use_path,
-  [3460] = 4,
+    STATE(134), 1,
+      sym_enum_case,
+    STATE(319), 1,
+      sym_enum_cases,
+  [3193] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(541), 1,
+    ACTIONS(415), 1,
       sym_id,
-    STATE(254), 1,
+    STATE(203), 1,
       aux_sym_package_decl_repeat1,
-    STATE(296), 1,
+    STATE(228), 1,
       sym_use_path,
-  [3473] = 4,
+  [3206] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(443), 1,
-      sym_id,
-    STATE(237), 1,
-      sym_use_path,
-    STATE(254), 1,
-      aux_sym_package_decl_repeat1,
-  [3486] = 3,
+    ACTIONS(501), 1,
+      anon_sym_RBRACE,
+    ACTIONS(503), 1,
+      anon_sym_COMMA,
+    STATE(180), 1,
+      aux_sym_flags_body_repeat1,
+  [3219] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(545), 1,
-      anon_sym_RBRACE,
-    ACTIONS(543), 2,
+    ACTIONS(443), 1,
       sym_id,
-      anon_sym_constructor,
-  [3497] = 4,
+    STATE(131), 1,
+      sym_variant_case,
+    STATE(257), 1,
+      sym_variant_cases,
+  [3232] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
-      sym_id,
-    ACTIONS(547), 1,
-      anon_sym_RBRACE,
-    STATE(225), 1,
-      sym_use_names_item,
-  [3510] = 4,
+    ACTIONS(505), 1,
+      anon_sym_COMMA,
+    ACTIONS(507), 1,
+      anon_sym_RPAREN,
+    STATE(136), 1,
+      aux_sym_named_type_list_repeat1,
+  [3245] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(549), 1,
+    ACTIONS(443), 1,
+      sym_id,
+    ACTIONS(509), 1,
       anon_sym_RBRACE,
-    ACTIONS(551), 1,
-      anon_sym_COMMA,
-    STATE(190), 1,
-      aux_sym_use_names_list_repeat1,
-  [3523] = 4,
+    STATE(205), 1,
+      sym_variant_case,
+  [3258] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(553), 1,
+    ACTIONS(509), 1,
+      anon_sym_RBRACE,
+    ACTIONS(511), 1,
       anon_sym_COMMA,
-    ACTIONS(556), 1,
-      anon_sym_GT,
-    STATE(183), 1,
-      aux_sym_tuple_list_repeat1,
-  [3536] = 4,
+    STATE(176), 1,
+      aux_sym_variant_cases_repeat1,
+  [3271] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
+    ACTIONS(455), 1,
       sym_id,
-    STATE(144), 1,
-      sym_use_names_item,
-    STATE(294), 1,
-      sym_use_names_list,
-  [3549] = 4,
+    ACTIONS(513), 1,
+      anon_sym_RBRACE,
+    STATE(174), 1,
+      sym_record_field,
+  [3284] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(529), 1,
+    ACTIONS(430), 1,
       sym_id,
-    ACTIONS(558), 1,
+    ACTIONS(515), 1,
       anon_sym_RBRACE,
-    STATE(227), 1,
-      sym_include_names_item,
-  [3562] = 4,
+    STATE(208), 1,
+      sym_enum_case,
+  [3297] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(560), 1,
+    ACTIONS(515), 1,
       anon_sym_RBRACE,
-    ACTIONS(562), 1,
-      anon_sym_COMMA,
-    STATE(194), 1,
-      aux_sym_include_names_list_repeat1,
-  [3575] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(564), 1,
+    ACTIONS(517), 1,
       anon_sym_COMMA,
-    ACTIONS(566), 1,
-      anon_sym_GT,
-    STATE(195), 1,
-      aux_sym_tuple_list_repeat1,
-  [3588] = 4,
+    STATE(173), 1,
+      aux_sym_enum_cases_repeat1,
+  [3310] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(568), 1,
-      anon_sym_COMMA,
-    ACTIONS(571), 1,
-      anon_sym_RPAREN,
-    STATE(188), 1,
-      aux_sym_named_type_list_repeat1,
-  [3601] = 4,
+    ACTIONS(519), 1,
+      anon_sym_func,
+    ACTIONS(521), 1,
+      anon_sym_static,
+    STATE(292), 1,
+      sym_func_type,
+  [3323] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(409), 1,
+    ACTIONS(367), 1,
       sym_id,
-    ACTIONS(573), 1,
+    ACTIONS(507), 1,
       anon_sym_RPAREN,
-    STATE(245), 1,
+    STATE(237), 1,
       sym_named_type,
-  [3614] = 4,
+  [3336] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(575), 1,
+    ACTIONS(525), 1,
       anon_sym_RBRACE,
-    ACTIONS(577), 1,
-      anon_sym_COMMA,
-    STATE(190), 1,
-      aux_sym_use_names_list_repeat1,
-  [3627] = 4,
+    ACTIONS(523), 2,
+      sym_id,
+      anon_sym_constructor,
+  [3347] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(451), 1,
-      sym_id,
-    ACTIONS(580), 1,
+    ACTIONS(527), 1,
       anon_sym_RBRACE,
-    STATE(217), 1,
-      sym_variant_case,
-  [3640] = 4,
+    ACTIONS(529), 1,
+      anon_sym_COMMA,
+    STATE(173), 1,
+      aux_sym_enum_cases_repeat1,
+  [3360] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(582), 1,
+    ACTIONS(532), 1,
       anon_sym_RBRACE,
-    ACTIONS(584), 1,
+    ACTIONS(534), 1,
       anon_sym_COMMA,
-    STATE(192), 1,
-      aux_sym_variant_body_repeat1,
-  [3653] = 4,
+    STATE(126), 1,
+      aux_sym_record_body_repeat1,
+  [3373] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(451), 1,
+    ACTIONS(430), 1,
       sym_id,
-    ACTIONS(587), 1,
+    ACTIONS(536), 1,
       anon_sym_RBRACE,
-    STATE(150), 1,
-      sym_variant_case,
-  [3666] = 4,
+    STATE(208), 1,
+      sym_enum_case,
+  [3386] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(589), 1,
+    ACTIONS(538), 1,
       anon_sym_RBRACE,
-    ACTIONS(591), 1,
+    ACTIONS(540), 1,
       anon_sym_COMMA,
-    STATE(194), 1,
-      aux_sym_include_names_list_repeat1,
-  [3679] = 4,
+    STATE(176), 1,
+      aux_sym_variant_cases_repeat1,
+  [3399] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(33), 1,
-      anon_sym_GT,
-    ACTIONS(594), 1,
+    ACTIONS(543), 1,
       anon_sym_COMMA,
-    STATE(183), 1,
-      aux_sym_tuple_list_repeat1,
-  [3692] = 3,
+    ACTIONS(545), 1,
+      anon_sym_RPAREN,
+    STATE(164), 1,
+      aux_sym_named_type_list_repeat1,
+  [3412] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(598), 1,
-      anon_sym_RBRACE,
-    ACTIONS(596), 2,
+    ACTIONS(443), 1,
       sym_id,
-      anon_sym_constructor,
-  [3703] = 4,
+    ACTIONS(547), 1,
+      anon_sym_RBRACE,
+    STATE(205), 1,
+      sym_variant_case,
+  [3425] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
+    ACTIONS(549), 1,
       sym_id,
-    ACTIONS(600), 1,
+    STATE(203), 1,
+      aux_sym_package_decl_repeat1,
+    STATE(250), 1,
+      sym_use_path,
+  [3438] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(551), 1,
       anon_sym_RBRACE,
-    STATE(211), 1,
-      sym_record_field,
-  [3716] = 4,
+    ACTIONS(553), 1,
+      anon_sym_COMMA,
+    STATE(180), 1,
+      aux_sym_flags_body_repeat1,
+  [3451] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(602), 1,
+    ACTIONS(556), 1,
       anon_sym_RBRACE,
-    ACTIONS(604), 1,
+    ACTIONS(558), 1,
       anon_sym_COMMA,
-    STATE(198), 1,
+    STATE(181), 1,
       aux_sym_record_body_repeat1,
-  [3729] = 4,
+  [3464] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(529), 1,
+    ACTIONS(403), 1,
       sym_id,
-    ACTIONS(607), 1,
+    ACTIONS(561), 1,
       anon_sym_RBRACE,
-    STATE(227), 1,
-      sym_include_names_item,
-  [3742] = 4,
+    STATE(221), 1,
+      sym_use_names_item,
+  [3477] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
+    ACTIONS(563), 1,
+      anon_sym_RBRACE,
+    ACTIONS(565), 1,
+      anon_sym_COMMA,
+    STATE(155), 1,
+      aux_sym_use_names_list_repeat1,
+  [3490] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(569), 1,
+      anon_sym_RBRACE,
+    ACTIONS(567), 2,
+      sym_id,
+      anon_sym_constructor,
+  [3501] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(455), 1,
       sym_id,
-    ACTIONS(609), 1,
+    ACTIONS(571), 1,
       anon_sym_RBRACE,
-    STATE(225), 1,
-      sym_use_names_item,
-  [3755] = 4,
+    STATE(197), 1,
+      sym_record_field,
+  [3514] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(409), 1,
+    ACTIONS(484), 1,
       sym_id,
-    ACTIONS(611), 1,
-      anon_sym_RPAREN,
-    STATE(245), 1,
-      sym_named_type,
-  [3768] = 4,
+    ACTIONS(573), 1,
+      anon_sym_RBRACE,
+    STATE(225), 1,
+      sym_include_names_item,
+  [3527] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(613), 1,
+    ACTIONS(575), 1,
       anon_sym_RBRACE,
-    ACTIONS(615), 1,
+    ACTIONS(577), 1,
       anon_sym_COMMA,
-    STATE(202), 1,
-      aux_sym_flags_body_repeat1,
-  [3781] = 4,
+    STATE(147), 1,
+      aux_sym_include_names_list_repeat1,
+  [3540] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(611), 1,
-      anon_sym_RPAREN,
-    ACTIONS(618), 1,
+    ACTIONS(579), 1,
       anon_sym_COMMA,
-    STATE(188), 1,
-      aux_sym_named_type_list_repeat1,
-  [3794] = 3,
+    ACTIONS(581), 1,
+      anon_sym_GT,
+    STATE(142), 1,
+      aux_sym_tuple_list_repeat1,
+  [3553] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(427), 1,
+    ACTIONS(231), 1,
+      anon_sym_RBRACE,
+    ACTIONS(229), 2,
       sym_id,
-    STATE(211), 1,
-      sym_record_field,
-  [3804] = 3,
+      anon_sym_constructor,
+  [3564] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(620), 1,
+    ACTIONS(415), 1,
+      sym_id,
+    STATE(203), 1,
+      aux_sym_package_decl_repeat1,
+    STATE(251), 1,
+      sym_use_path,
+  [3577] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(583), 1,
       anon_sym_LBRACE,
-    STATE(28), 1,
-      sym_interface_body,
-  [3814] = 3,
+    STATE(123), 1,
+      sym_world_body,
+  [3587] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(622), 1,
-      anon_sym_LPAREN,
-    STATE(303), 1,
-      sym_param_list,
-  [3824] = 3,
+    ACTIONS(585), 1,
+      sym_id,
+    STATE(192), 1,
+      aux_sym_package_decl_repeat1,
+  [3597] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(624), 1,
+    ACTIONS(588), 1,
       anon_sym_COMMA,
-    ACTIONS(626), 1,
+    ACTIONS(590), 1,
       anon_sym_GT,
-  [3834] = 3,
+  [3607] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(628), 1,
-      sym_id,
-    ACTIONS(630), 1,
-      anon_sym_RBRACE,
-  [3844] = 2,
+    ACTIONS(592), 1,
+      anon_sym_LBRACE,
+    STATE(121), 1,
+      sym_interface_body,
+  [3617] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(632), 2,
+    ACTIONS(594), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [3852] = 3,
+  [3625] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(622), 1,
-      anon_sym_LPAREN,
-    STATE(140), 1,
-      sym_param_list,
-  [3862] = 2,
+    ACTIONS(596), 1,
+      anon_sym_LBRACE,
+    STATE(31), 1,
+      sym_enum_body,
+  [3635] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(602), 2,
+    ACTIONS(556), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [3870] = 2,
+  [3643] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(613), 2,
+    ACTIONS(598), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [3878] = 3,
+  [3651] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(634), 1,
+    ACTIONS(600), 1,
       sym_id,
-    STATE(249), 1,
+    STATE(206), 1,
       aux_sym_package_decl_repeat1,
-  [3888] = 3,
+  [3661] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(628), 1,
-      sym_id,
-    ACTIONS(636), 1,
+    ACTIONS(551), 2,
       anon_sym_RBRACE,
-  [3898] = 3,
+      anon_sym_COMMA,
+  [3669] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(628), 1,
+    ACTIONS(602), 1,
+      anon_sym_LBRACE,
+    STATE(32), 1,
+      sym_variant_body,
+  [3679] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(604), 1,
       sym_id,
-    ACTIONS(638), 1,
+    ACTIONS(606), 1,
       anon_sym_RBRACE,
-  [3908] = 3,
+  [3689] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(640), 1,
+    ACTIONS(608), 1,
       sym_id,
-    ACTIONS(642), 1,
-      anon_sym_RBRACE,
-  [3918] = 2,
+    STATE(192), 1,
+      aux_sym_package_decl_repeat1,
+  [3699] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(610), 1,
+      anon_sym_SEMI,
+    ACTIONS(612), 1,
+      anon_sym_as,
+  [3709] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(582), 2,
+    ACTIONS(538), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [3926] = 3,
+  [3717] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(628), 1,
+    ACTIONS(614), 1,
       sym_id,
-    ACTIONS(644), 1,
+    STATE(192), 1,
+      aux_sym_package_decl_repeat1,
+  [3727] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(616), 1,
+      anon_sym_LBRACE,
+    STATE(60), 1,
+      sym_record_body,
+  [3737] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(527), 2,
       anon_sym_RBRACE,
-  [3936] = 3,
+      anon_sym_COMMA,
+  [3745] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(521), 1,
+    ACTIONS(618), 1,
+      anon_sym_LBRACE,
+    STATE(81), 1,
+      sym_flags_body,
+  [3755] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(620), 2,
+      anon_sym_SEMI,
+      anon_sym_DASH_GT,
+  [3763] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(519), 1,
       anon_sym_func,
-    STATE(261), 1,
+    STATE(254), 1,
       sym_func_type,
-  [3946] = 3,
+  [3773] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(646), 1,
-      sym_id,
-    ACTIONS(648), 1,
-      anon_sym_RBRACE,
-  [3956] = 2,
+    ACTIONS(622), 1,
+      anon_sym_LBRACE,
+    STATE(82), 1,
+      sym_variant_body,
+  [3783] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(624), 1,
+      anon_sym_LBRACE,
+    STATE(34), 1,
+      sym_flags_body,
+  [3793] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(650), 2,
+    ACTIONS(626), 2,
       anon_sym_SEMI,
       anon_sym_DASH_GT,
-  [3964] = 3,
+  [3801] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(473), 1,
-      anon_sym_RBRACE,
     ACTIONS(628), 1,
-      sym_id,
-  [3974] = 2,
+      anon_sym_LBRACE,
+    STATE(40), 1,
+      sym_include_names_body,
+  [3811] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(652), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [3982] = 3,
+    ACTIONS(630), 1,
+      anon_sym_LBRACE,
+    STATE(83), 1,
+      sym_enum_body,
+  [3821] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(654), 1,
+    ACTIONS(632), 1,
       anon_sym_LBRACE,
-    STATE(38), 1,
-      sym_include_names_body,
-  [3992] = 2,
+    STATE(36), 1,
+      sym_record_body,
+  [3831] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(656), 2,
+    ACTIONS(634), 1,
+      sym_id,
+    ACTIONS(636), 1,
       anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [4000] = 2,
+  [3841] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(658), 2,
+    ACTIONS(638), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [4008] = 2,
+  [3849] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(660), 2,
+    ACTIONS(367), 1,
+      sym_id,
+    STATE(237), 1,
+      sym_named_type,
+  [3859] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(640), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [4016] = 3,
+  [3867] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(497), 1,
+    ACTIONS(501), 1,
       anon_sym_RBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(604), 1,
       sym_id,
-  [4026] = 3,
+  [3877] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(493), 1,
-      anon_sym_RBRACE,
-    ACTIONS(628), 1,
-      sym_id,
-  [4036] = 3,
+    ACTIONS(642), 1,
+      anon_sym_LPAREN,
+    STATE(141), 1,
+      sym_param_list,
+  [3887] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(521), 1,
-      anon_sym_func,
-    STATE(319), 1,
-      sym_func_type,
-  [4046] = 3,
+    ACTIONS(644), 2,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+  [3895] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(662), 1,
-      anon_sym_LBRACE,
-    STATE(26), 1,
-      sym_enum_body,
-  [4056] = 3,
+    ACTIONS(646), 2,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+  [3903] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(664), 1,
+    ACTIONS(592), 1,
       anon_sym_LBRACE,
-    STATE(48), 1,
-      sym_variant_body,
-  [4066] = 3,
+    STATE(35), 1,
+      sym_interface_body,
+  [3913] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(666), 1,
-      anon_sym_LBRACE,
-    STATE(50), 1,
-      sym_flags_body,
-  [4076] = 3,
+    ACTIONS(648), 1,
+      sym_id,
+    ACTIONS(650), 1,
+      anon_sym_RBRACE,
+  [3923] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(668), 1,
-      anon_sym_LBRACE,
-    STATE(58), 1,
-      sym_record_body,
-  [4086] = 3,
+    ACTIONS(652), 1,
+      anon_sym_SEMI,
+    ACTIONS(654), 1,
+      anon_sym_with,
+  [3933] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(517), 1,
+    ACTIONS(463), 1,
       anon_sym_RBRACE,
-    ACTIONS(628), 1,
+    ACTIONS(604), 1,
       sym_id,
-  [4096] = 3,
+  [3943] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(670), 1,
-      sym_id,
-    ACTIONS(672), 1,
-      anon_sym_RBRACE,
-  [4106] = 3,
+    ACTIONS(363), 1,
+      anon_sym_SEMI,
+    ACTIONS(656), 1,
+      anon_sym_COLON,
+  [3953] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(674), 1,
+    ACTIONS(363), 1,
       anon_sym_SEMI,
-    ACTIONS(676), 1,
-      anon_sym_with,
-  [4116] = 3,
+    ACTIONS(658), 1,
+      anon_sym_COLON,
+  [3963] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(678), 1,
+    ACTIONS(455), 1,
       sym_id,
-    ACTIONS(680), 1,
-      anon_sym_RBRACE,
-  [4126] = 2,
+    STATE(197), 1,
+      sym_record_field,
+  [3973] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(682), 2,
+    ACTIONS(660), 2,
       anon_sym_RBRACE,
       anon_sym_COMMA,
-  [4134] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(684), 2,
-      anon_sym_SEMI,
-      anon_sym_DASH_GT,
-  [4142] = 3,
+  [3981] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(451), 1,
+    ACTIONS(443), 1,
       sym_id,
-    STATE(217), 1,
+    STATE(205), 1,
       sym_variant_case,
-  [4152] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(377), 1,
-      anon_sym_SEMI,
-    ACTIONS(686), 1,
-      anon_sym_COLON,
-  [4162] = 3,
+  [3991] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(688), 1,
-      anon_sym_LBRACE,
-    STATE(88), 1,
-      sym_enum_body,
-  [4172] = 2,
+    ACTIONS(430), 1,
+      sym_id,
+    STATE(208), 1,
+      sym_enum_case,
+  [4001] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(690), 2,
+    ACTIONS(662), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [4180] = 2,
+  [4009] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(571), 2,
+    ACTIONS(435), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [4188] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(692), 1,
-      anon_sym_LBRACE,
-    STATE(89), 1,
-      sym_variant_body,
-  [4198] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(694), 1,
-      anon_sym_LBRACE,
-    STATE(90), 1,
-      sym_flags_body,
-  [4208] = 3,
+  [4017] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(696), 1,
-      anon_sym_LBRACE,
-    STATE(93), 1,
-      sym_record_body,
-  [4218] = 3,
+    ACTIONS(604), 1,
+      sym_id,
+    ACTIONS(664), 1,
+      anon_sym_RBRACE,
+  [4027] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(698), 1,
-      sym_id,
-    STATE(258), 1,
-      aux_sym_package_decl_repeat1,
-  [4228] = 3,
+    ACTIONS(642), 1,
+      anon_sym_LPAREN,
+    STATE(289), 1,
+      sym_param_list,
+  [4037] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
+    ACTIONS(403), 1,
       sym_id,
-    STATE(225), 1,
+    STATE(221), 1,
       sym_use_names_item,
-  [4238] = 3,
+  [4047] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(529), 1,
+    ACTIONS(484), 1,
       sym_id,
-    STATE(227), 1,
+    STATE(225), 1,
       sym_include_names_item,
-  [4248] = 2,
+  [4057] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(556), 2,
+    ACTIONS(424), 2,
       anon_sym_COMMA,
       anon_sym_GT,
-  [4256] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(700), 1,
-      anon_sym_SEMI,
-    ACTIONS(702), 1,
-      anon_sym_as,
-  [4266] = 3,
+  [4065] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(704), 1,
-      sym_id,
-    STATE(258), 1,
-      aux_sym_package_decl_repeat1,
-  [4276] = 3,
+    ACTIONS(519), 1,
+      anon_sym_func,
+    STATE(290), 1,
+      sym_func_type,
+  [4075] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(706), 1,
-      anon_sym_LBRACE,
-    STATE(130), 1,
-      sym_world_body,
-  [4286] = 3,
+    ACTIONS(666), 1,
+      anon_sym_COLON,
+  [4082] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(620), 1,
-      anon_sym_LBRACE,
-    STATE(128), 1,
-      sym_interface_body,
-  [4296] = 3,
+    ACTIONS(668), 1,
+      anon_sym_SEMI,
+  [4089] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(409), 1,
-      sym_id,
-    STATE(245), 1,
-      sym_named_type,
-  [4306] = 3,
+    ACTIONS(670), 1,
+      anon_sym_SEMI,
+  [4096] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(708), 1,
+    ACTIONS(604), 1,
       sym_id,
-    STATE(258), 1,
-      aux_sym_package_decl_repeat1,
-  [4316] = 3,
+  [4103] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(377), 1,
+    ACTIONS(672), 1,
       anon_sym_SEMI,
-    ACTIONS(711), 1,
-      anon_sym_COLON,
-  [4326] = 2,
+  [4110] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(713), 1,
-      sym_id,
-  [4333] = 2,
+    ACTIONS(674), 1,
+      anon_sym_RPAREN,
+  [4117] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(715), 1,
+    ACTIONS(676), 1,
       anon_sym_SEMI,
-  [4340] = 2,
+  [4124] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(678), 1,
+      anon_sym_DOT,
+  [4131] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(717), 1,
+    ACTIONS(680), 1,
       sym_valid_semver,
-  [4347] = 2,
+  [4138] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(682), 1,
+      anon_sym_COLON,
+  [4145] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(719), 1,
+    ACTIONS(684), 1,
       anon_sym_SEMI,
-  [4354] = 2,
+  [4152] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(721), 1,
-      anon_sym_COLON,
-  [4361] = 2,
+    ACTIONS(686), 1,
+      anon_sym_GT,
+  [4159] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(723), 1,
-      sym_id,
-  [4368] = 2,
+    ACTIONS(688), 1,
+      sym_valid_semver,
+  [4166] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(725), 1,
-      sym_id,
-  [4375] = 2,
+    ACTIONS(690), 1,
+      anon_sym_RBRACE,
+  [4173] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(727), 1,
-      anon_sym_GT,
-  [4382] = 2,
+    ACTIONS(692), 1,
+      anon_sym_SEMI,
+  [4180] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(729), 1,
+    ACTIONS(694), 1,
       sym_id,
-  [4389] = 2,
+  [4187] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(731), 1,
+    ACTIONS(696), 1,
       sym_id,
-  [4396] = 2,
+  [4194] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(733), 1,
+    ACTIONS(698), 1,
       sym_id,
-  [4403] = 2,
+  [4201] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(735), 1,
-      anon_sym_SEMI,
-  [4410] = 2,
+    ACTIONS(700), 1,
+      sym_id,
+  [4208] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(702), 1,
+      sym_id,
+  [4215] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(737), 1,
+    ACTIONS(704), 1,
       sym_id,
-  [4417] = 2,
+  [4222] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(739), 1,
-      anon_sym_SEMI,
-  [4424] = 2,
+    ACTIONS(706), 1,
+      anon_sym_EQ,
+  [4229] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(624), 1,
-      anon_sym_COMMA,
-  [4431] = 2,
+    ACTIONS(708), 1,
+      anon_sym_SEMI,
+  [4236] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(741), 1,
+    ACTIONS(710), 1,
       anon_sym_RPAREN,
-  [4438] = 2,
+  [4243] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(712), 1,
+      anon_sym_GT,
+  [4250] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(743), 1,
+    ACTIONS(714), 1,
       sym_valid_semver,
-  [4445] = 2,
+  [4257] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(745), 1,
+    ACTIONS(716), 1,
       anon_sym_SEMI,
-  [4452] = 2,
+  [4264] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(747), 1,
+    ACTIONS(718), 1,
       sym_valid_semver,
-  [4459] = 2,
+  [4271] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(749), 1,
-      sym_id,
-  [4466] = 2,
+    ACTIONS(588), 1,
+      anon_sym_COMMA,
+  [4278] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(751), 1,
+    ACTIONS(720), 1,
       sym_id,
-  [4473] = 2,
+  [4285] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(753), 1,
-      anon_sym_DOT,
-  [4480] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(755), 1,
+    ACTIONS(722), 1,
       sym_id,
-  [4487] = 2,
+  [4292] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(757), 1,
-      anon_sym_SEMI,
-  [4494] = 2,
+    ACTIONS(724), 1,
+      anon_sym_GT,
+  [4299] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(759), 1,
+    ACTIONS(726), 1,
       sym_id,
-  [4501] = 2,
+  [4306] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(761), 1,
+    ACTIONS(728), 1,
       anon_sym_GT,
-  [4508] = 2,
+  [4313] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(763), 1,
+    ACTIONS(730), 1,
       anon_sym_GT,
-  [4515] = 2,
+  [4320] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(732), 1,
+      sym_id,
+  [4327] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(765), 1,
+    ACTIONS(734), 1,
       anon_sym_SEMI,
-  [4522] = 2,
+  [4334] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(305), 1,
+    ACTIONS(736), 1,
+      sym_id,
+  [4341] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(296), 1,
       anon_sym_COLON,
-  [4529] = 2,
+  [4348] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(767), 1,
+    ACTIONS(738), 1,
       ts_builtin_sym_end,
-  [4536] = 2,
+  [4355] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(769), 1,
+    ACTIONS(740), 1,
       sym_id,
-  [4543] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(771), 1,
-      anon_sym_RPAREN,
-  [4550] = 2,
+  [4362] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(773), 1,
+    ACTIONS(742), 1,
       anon_sym_SEMI,
-  [4557] = 2,
+  [4369] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(775), 1,
-      anon_sym_GT,
-  [4564] = 2,
+    ACTIONS(744), 1,
+      anon_sym_SEMI,
+  [4376] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(777), 1,
-      anon_sym_RBRACE,
-  [4571] = 2,
+    ACTIONS(746), 1,
+      anon_sym_RPAREN,
+  [4383] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(779), 1,
-      sym_valid_semver,
-  [4578] = 2,
+    ACTIONS(748), 1,
+      anon_sym_LBRACE,
+  [4390] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(781), 1,
+    ACTIONS(750), 1,
       anon_sym_SEMI,
-  [4585] = 2,
+  [4397] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(783), 1,
-      anon_sym_COLON,
-  [4592] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(628), 1,
-      sym_id,
-  [4599] = 2,
+    ACTIONS(752), 1,
+      anon_sym_SEMI,
+  [4404] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(785), 1,
+    ACTIONS(754), 1,
       sym_id,
-  [4606] = 2,
+  [4411] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(787), 1,
+    ACTIONS(756), 1,
       anon_sym_SEMI,
-  [4613] = 2,
+  [4418] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(789), 1,
+    ACTIONS(758), 1,
       anon_sym_SEMI,
-  [4620] = 2,
+  [4425] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(791), 1,
-      anon_sym_SEMI,
-  [4627] = 2,
+    ACTIONS(760), 1,
+      sym_id,
+  [4432] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(793), 1,
+    ACTIONS(762), 1,
       anon_sym_SEMI,
-  [4634] = 2,
+  [4439] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(795), 1,
-      anon_sym_COLON,
-  [4641] = 2,
+    ACTIONS(764), 1,
+      anon_sym_RBRACE,
+  [4446] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(797), 1,
-      anon_sym_LT,
-  [4648] = 2,
+    ACTIONS(766), 1,
+      anon_sym_RBRACE,
+  [4453] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(799), 1,
+    ACTIONS(768), 1,
       sym_id,
-  [4655] = 2,
+  [4460] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(801), 1,
+    ACTIONS(770), 1,
       anon_sym_LT,
-  [4662] = 2,
+  [4467] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(803), 1,
+    ACTIONS(772), 1,
       anon_sym_LT,
-  [4669] = 2,
+  [4474] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(805), 1,
-      anon_sym_EQ,
-  [4676] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(807), 1,
-      anon_sym_LT,
-  [4683] = 2,
+    ACTIONS(774), 1,
+      anon_sym_RBRACE,
+  [4481] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(809), 1,
-      anon_sym_SEMI,
-  [4690] = 2,
+    ACTIONS(776), 1,
+      anon_sym_as,
+  [4488] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(811), 1,
+    ACTIONS(778), 1,
       anon_sym_SEMI,
-  [4697] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(813), 1,
-      anon_sym_LBRACE,
-  [4704] = 2,
+  [4495] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(815), 1,
-      anon_sym_COLON,
-  [4711] = 2,
+    ACTIONS(780), 1,
+      anon_sym_LT,
+  [4502] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(817), 1,
-      anon_sym_SEMI,
-  [4718] = 2,
+    ACTIONS(782), 1,
+      anon_sym_RBRACE,
+  [4509] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(819), 1,
+    ACTIONS(784), 1,
       sym_id,
-  [4725] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(821), 1,
-      anon_sym_SEMI,
-  [4732] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(823), 1,
-      anon_sym_RPAREN,
-  [4739] = 2,
+  [4516] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(825), 1,
-      anon_sym_SEMI,
-  [4746] = 2,
+    ACTIONS(786), 1,
+      sym_id,
+  [4523] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(827), 1,
+    ACTIONS(788), 1,
       sym_id,
-  [4753] = 2,
+  [4530] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(829), 1,
+    ACTIONS(790), 1,
       sym_id,
-  [4760] = 2,
+  [4537] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(831), 1,
-      sym_id,
-  [4767] = 2,
+    ACTIONS(792), 1,
+      anon_sym_LT,
+  [4544] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(833), 1,
-      sym_id,
-  [4774] = 2,
+    ACTIONS(794), 1,
+      anon_sym_SEMI,
+  [4551] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(835), 1,
-      anon_sym_RBRACE,
-  [4781] = 2,
+    ACTIONS(796), 1,
+      anon_sym_COLON,
+  [4558] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(837), 1,
+    ACTIONS(798), 1,
       anon_sym_RBRACE,
-  [4788] = 2,
+  [4565] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(839), 1,
+    ACTIONS(800), 1,
       anon_sym_EQ,
-  [4795] = 2,
+  [4572] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(841), 1,
-      anon_sym_as,
-  [4802] = 2,
+    ACTIONS(802), 1,
+      anon_sym_COLON,
+  [4579] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(843), 1,
+    ACTIONS(804), 1,
       sym_id,
-  [4809] = 2,
+  [4586] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(845), 1,
+    ACTIONS(806), 1,
       anon_sym_LBRACE,
-  [4816] = 2,
+  [4593] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(847), 1,
+    ACTIONS(808), 1,
       anon_sym_DOT,
-  [4823] = 2,
+  [4600] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(849), 1,
-      anon_sym_GT,
+    ACTIONS(810), 1,
+      anon_sym_RBRACE,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
@@ -7275,252 +7065,240 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(83)] = 2110,
   [SMALL_STATE(84)] = 2127,
   [SMALL_STATE(85)] = 2144,
-  [SMALL_STATE(86)] = 2161,
-  [SMALL_STATE(87)] = 2178,
-  [SMALL_STATE(88)] = 2195,
-  [SMALL_STATE(89)] = 2212,
-  [SMALL_STATE(90)] = 2229,
-  [SMALL_STATE(91)] = 2246,
-  [SMALL_STATE(92)] = 2263,
-  [SMALL_STATE(93)] = 2280,
-  [SMALL_STATE(94)] = 2297,
-  [SMALL_STATE(95)] = 2314,
-  [SMALL_STATE(96)] = 2331,
-  [SMALL_STATE(97)] = 2348,
-  [SMALL_STATE(98)] = 2370,
-  [SMALL_STATE(99)] = 2392,
-  [SMALL_STATE(100)] = 2414,
-  [SMALL_STATE(101)] = 2436,
-  [SMALL_STATE(102)] = 2458,
-  [SMALL_STATE(103)] = 2477,
-  [SMALL_STATE(104)] = 2494,
-  [SMALL_STATE(105)] = 2514,
-  [SMALL_STATE(106)] = 2528,
-  [SMALL_STATE(107)] = 2548,
-  [SMALL_STATE(108)] = 2568,
-  [SMALL_STATE(109)] = 2582,
-  [SMALL_STATE(110)] = 2602,
-  [SMALL_STATE(111)] = 2622,
-  [SMALL_STATE(112)] = 2633,
-  [SMALL_STATE(113)] = 2644,
-  [SMALL_STATE(114)] = 2663,
-  [SMALL_STATE(115)] = 2674,
-  [SMALL_STATE(116)] = 2685,
-  [SMALL_STATE(117)] = 2696,
-  [SMALL_STATE(118)] = 2709,
-  [SMALL_STATE(119)] = 2728,
-  [SMALL_STATE(120)] = 2739,
-  [SMALL_STATE(121)] = 2758,
-  [SMALL_STATE(122)] = 2769,
-  [SMALL_STATE(123)] = 2780,
-  [SMALL_STATE(124)] = 2790,
-  [SMALL_STATE(125)] = 2800,
-  [SMALL_STATE(126)] = 2816,
-  [SMALL_STATE(127)] = 2826,
-  [SMALL_STATE(128)] = 2836,
-  [SMALL_STATE(129)] = 2846,
-  [SMALL_STATE(130)] = 2856,
-  [SMALL_STATE(131)] = 2866,
-  [SMALL_STATE(132)] = 2876,
-  [SMALL_STATE(133)] = 2892,
-  [SMALL_STATE(134)] = 2902,
-  [SMALL_STATE(135)] = 2918,
-  [SMALL_STATE(136)] = 2928,
-  [SMALL_STATE(137)] = 2938,
-  [SMALL_STATE(138)] = 2948,
-  [SMALL_STATE(139)] = 2961,
-  [SMALL_STATE(140)] = 2974,
-  [SMALL_STATE(141)] = 2987,
-  [SMALL_STATE(142)] = 3000,
-  [SMALL_STATE(143)] = 3011,
-  [SMALL_STATE(144)] = 3024,
-  [SMALL_STATE(145)] = 3037,
-  [SMALL_STATE(146)] = 3050,
-  [SMALL_STATE(147)] = 3063,
-  [SMALL_STATE(148)] = 3076,
-  [SMALL_STATE(149)] = 3089,
-  [SMALL_STATE(150)] = 3100,
-  [SMALL_STATE(151)] = 3113,
-  [SMALL_STATE(152)] = 3126,
-  [SMALL_STATE(153)] = 3137,
-  [SMALL_STATE(154)] = 3150,
-  [SMALL_STATE(155)] = 3163,
-  [SMALL_STATE(156)] = 3176,
-  [SMALL_STATE(157)] = 3189,
-  [SMALL_STATE(158)] = 3202,
-  [SMALL_STATE(159)] = 3215,
-  [SMALL_STATE(160)] = 3228,
-  [SMALL_STATE(161)] = 3241,
-  [SMALL_STATE(162)] = 3254,
-  [SMALL_STATE(163)] = 3267,
-  [SMALL_STATE(164)] = 3280,
-  [SMALL_STATE(165)] = 3293,
-  [SMALL_STATE(166)] = 3306,
-  [SMALL_STATE(167)] = 3319,
-  [SMALL_STATE(168)] = 3332,
-  [SMALL_STATE(169)] = 3345,
-  [SMALL_STATE(170)] = 3358,
-  [SMALL_STATE(171)] = 3371,
-  [SMALL_STATE(172)] = 3384,
-  [SMALL_STATE(173)] = 3397,
-  [SMALL_STATE(174)] = 3410,
-  [SMALL_STATE(175)] = 3423,
-  [SMALL_STATE(176)] = 3434,
-  [SMALL_STATE(177)] = 3447,
-  [SMALL_STATE(178)] = 3460,
-  [SMALL_STATE(179)] = 3473,
-  [SMALL_STATE(180)] = 3486,
-  [SMALL_STATE(181)] = 3497,
-  [SMALL_STATE(182)] = 3510,
-  [SMALL_STATE(183)] = 3523,
-  [SMALL_STATE(184)] = 3536,
-  [SMALL_STATE(185)] = 3549,
-  [SMALL_STATE(186)] = 3562,
-  [SMALL_STATE(187)] = 3575,
-  [SMALL_STATE(188)] = 3588,
-  [SMALL_STATE(189)] = 3601,
-  [SMALL_STATE(190)] = 3614,
-  [SMALL_STATE(191)] = 3627,
-  [SMALL_STATE(192)] = 3640,
-  [SMALL_STATE(193)] = 3653,
-  [SMALL_STATE(194)] = 3666,
-  [SMALL_STATE(195)] = 3679,
-  [SMALL_STATE(196)] = 3692,
-  [SMALL_STATE(197)] = 3703,
-  [SMALL_STATE(198)] = 3716,
-  [SMALL_STATE(199)] = 3729,
-  [SMALL_STATE(200)] = 3742,
-  [SMALL_STATE(201)] = 3755,
-  [SMALL_STATE(202)] = 3768,
-  [SMALL_STATE(203)] = 3781,
-  [SMALL_STATE(204)] = 3794,
-  [SMALL_STATE(205)] = 3804,
-  [SMALL_STATE(206)] = 3814,
-  [SMALL_STATE(207)] = 3824,
-  [SMALL_STATE(208)] = 3834,
-  [SMALL_STATE(209)] = 3844,
-  [SMALL_STATE(210)] = 3852,
-  [SMALL_STATE(211)] = 3862,
-  [SMALL_STATE(212)] = 3870,
-  [SMALL_STATE(213)] = 3878,
-  [SMALL_STATE(214)] = 3888,
-  [SMALL_STATE(215)] = 3898,
-  [SMALL_STATE(216)] = 3908,
-  [SMALL_STATE(217)] = 3918,
-  [SMALL_STATE(218)] = 3926,
-  [SMALL_STATE(219)] = 3936,
-  [SMALL_STATE(220)] = 3946,
-  [SMALL_STATE(221)] = 3956,
-  [SMALL_STATE(222)] = 3964,
-  [SMALL_STATE(223)] = 3974,
-  [SMALL_STATE(224)] = 3982,
-  [SMALL_STATE(225)] = 3992,
-  [SMALL_STATE(226)] = 4000,
-  [SMALL_STATE(227)] = 4008,
-  [SMALL_STATE(228)] = 4016,
-  [SMALL_STATE(229)] = 4026,
-  [SMALL_STATE(230)] = 4036,
-  [SMALL_STATE(231)] = 4046,
-  [SMALL_STATE(232)] = 4056,
-  [SMALL_STATE(233)] = 4066,
-  [SMALL_STATE(234)] = 4076,
-  [SMALL_STATE(235)] = 4086,
-  [SMALL_STATE(236)] = 4096,
-  [SMALL_STATE(237)] = 4106,
-  [SMALL_STATE(238)] = 4116,
-  [SMALL_STATE(239)] = 4126,
-  [SMALL_STATE(240)] = 4134,
-  [SMALL_STATE(241)] = 4142,
-  [SMALL_STATE(242)] = 4152,
-  [SMALL_STATE(243)] = 4162,
-  [SMALL_STATE(244)] = 4172,
-  [SMALL_STATE(245)] = 4180,
-  [SMALL_STATE(246)] = 4188,
-  [SMALL_STATE(247)] = 4198,
-  [SMALL_STATE(248)] = 4208,
-  [SMALL_STATE(249)] = 4218,
-  [SMALL_STATE(250)] = 4228,
-  [SMALL_STATE(251)] = 4238,
-  [SMALL_STATE(252)] = 4248,
-  [SMALL_STATE(253)] = 4256,
-  [SMALL_STATE(254)] = 4266,
-  [SMALL_STATE(255)] = 4276,
-  [SMALL_STATE(256)] = 4286,
-  [SMALL_STATE(257)] = 4296,
-  [SMALL_STATE(258)] = 4306,
-  [SMALL_STATE(259)] = 4316,
-  [SMALL_STATE(260)] = 4326,
-  [SMALL_STATE(261)] = 4333,
-  [SMALL_STATE(262)] = 4340,
-  [SMALL_STATE(263)] = 4347,
-  [SMALL_STATE(264)] = 4354,
-  [SMALL_STATE(265)] = 4361,
-  [SMALL_STATE(266)] = 4368,
-  [SMALL_STATE(267)] = 4375,
-  [SMALL_STATE(268)] = 4382,
-  [SMALL_STATE(269)] = 4389,
-  [SMALL_STATE(270)] = 4396,
-  [SMALL_STATE(271)] = 4403,
-  [SMALL_STATE(272)] = 4410,
-  [SMALL_STATE(273)] = 4417,
-  [SMALL_STATE(274)] = 4424,
-  [SMALL_STATE(275)] = 4431,
-  [SMALL_STATE(276)] = 4438,
-  [SMALL_STATE(277)] = 4445,
-  [SMALL_STATE(278)] = 4452,
-  [SMALL_STATE(279)] = 4459,
-  [SMALL_STATE(280)] = 4466,
-  [SMALL_STATE(281)] = 4473,
-  [SMALL_STATE(282)] = 4480,
-  [SMALL_STATE(283)] = 4487,
-  [SMALL_STATE(284)] = 4494,
-  [SMALL_STATE(285)] = 4501,
-  [SMALL_STATE(286)] = 4508,
-  [SMALL_STATE(287)] = 4515,
-  [SMALL_STATE(288)] = 4522,
-  [SMALL_STATE(289)] = 4529,
-  [SMALL_STATE(290)] = 4536,
-  [SMALL_STATE(291)] = 4543,
-  [SMALL_STATE(292)] = 4550,
-  [SMALL_STATE(293)] = 4557,
-  [SMALL_STATE(294)] = 4564,
-  [SMALL_STATE(295)] = 4571,
-  [SMALL_STATE(296)] = 4578,
-  [SMALL_STATE(297)] = 4585,
-  [SMALL_STATE(298)] = 4592,
-  [SMALL_STATE(299)] = 4599,
-  [SMALL_STATE(300)] = 4606,
-  [SMALL_STATE(301)] = 4613,
-  [SMALL_STATE(302)] = 4620,
-  [SMALL_STATE(303)] = 4627,
-  [SMALL_STATE(304)] = 4634,
-  [SMALL_STATE(305)] = 4641,
-  [SMALL_STATE(306)] = 4648,
-  [SMALL_STATE(307)] = 4655,
-  [SMALL_STATE(308)] = 4662,
-  [SMALL_STATE(309)] = 4669,
-  [SMALL_STATE(310)] = 4676,
-  [SMALL_STATE(311)] = 4683,
-  [SMALL_STATE(312)] = 4690,
-  [SMALL_STATE(313)] = 4697,
-  [SMALL_STATE(314)] = 4704,
-  [SMALL_STATE(315)] = 4711,
-  [SMALL_STATE(316)] = 4718,
-  [SMALL_STATE(317)] = 4725,
-  [SMALL_STATE(318)] = 4732,
-  [SMALL_STATE(319)] = 4739,
-  [SMALL_STATE(320)] = 4746,
-  [SMALL_STATE(321)] = 4753,
-  [SMALL_STATE(322)] = 4760,
-  [SMALL_STATE(323)] = 4767,
-  [SMALL_STATE(324)] = 4774,
-  [SMALL_STATE(325)] = 4781,
-  [SMALL_STATE(326)] = 4788,
-  [SMALL_STATE(327)] = 4795,
-  [SMALL_STATE(328)] = 4802,
-  [SMALL_STATE(329)] = 4809,
-  [SMALL_STATE(330)] = 4816,
-  [SMALL_STATE(331)] = 4823,
+  [SMALL_STATE(86)] = 2166,
+  [SMALL_STATE(87)] = 2188,
+  [SMALL_STATE(88)] = 2210,
+  [SMALL_STATE(89)] = 2232,
+  [SMALL_STATE(90)] = 2254,
+  [SMALL_STATE(91)] = 2273,
+  [SMALL_STATE(92)] = 2290,
+  [SMALL_STATE(93)] = 2310,
+  [SMALL_STATE(94)] = 2330,
+  [SMALL_STATE(95)] = 2350,
+  [SMALL_STATE(96)] = 2364,
+  [SMALL_STATE(97)] = 2384,
+  [SMALL_STATE(98)] = 2398,
+  [SMALL_STATE(99)] = 2418,
+  [SMALL_STATE(100)] = 2429,
+  [SMALL_STATE(101)] = 2440,
+  [SMALL_STATE(102)] = 2451,
+  [SMALL_STATE(103)] = 2470,
+  [SMALL_STATE(104)] = 2481,
+  [SMALL_STATE(105)] = 2492,
+  [SMALL_STATE(106)] = 2503,
+  [SMALL_STATE(107)] = 2522,
+  [SMALL_STATE(108)] = 2533,
+  [SMALL_STATE(109)] = 2544,
+  [SMALL_STATE(110)] = 2563,
+  [SMALL_STATE(111)] = 2576,
+  [SMALL_STATE(112)] = 2586,
+  [SMALL_STATE(113)] = 2602,
+  [SMALL_STATE(114)] = 2612,
+  [SMALL_STATE(115)] = 2622,
+  [SMALL_STATE(116)] = 2632,
+  [SMALL_STATE(117)] = 2642,
+  [SMALL_STATE(118)] = 2652,
+  [SMALL_STATE(119)] = 2662,
+  [SMALL_STATE(120)] = 2678,
+  [SMALL_STATE(121)] = 2688,
+  [SMALL_STATE(122)] = 2698,
+  [SMALL_STATE(123)] = 2714,
+  [SMALL_STATE(124)] = 2724,
+  [SMALL_STATE(125)] = 2734,
+  [SMALL_STATE(126)] = 2744,
+  [SMALL_STATE(127)] = 2757,
+  [SMALL_STATE(128)] = 2770,
+  [SMALL_STATE(129)] = 2783,
+  [SMALL_STATE(130)] = 2794,
+  [SMALL_STATE(131)] = 2807,
+  [SMALL_STATE(132)] = 2820,
+  [SMALL_STATE(133)] = 2833,
+  [SMALL_STATE(134)] = 2846,
+  [SMALL_STATE(135)] = 2859,
+  [SMALL_STATE(136)] = 2872,
+  [SMALL_STATE(137)] = 2885,
+  [SMALL_STATE(138)] = 2898,
+  [SMALL_STATE(139)] = 2909,
+  [SMALL_STATE(140)] = 2922,
+  [SMALL_STATE(141)] = 2935,
+  [SMALL_STATE(142)] = 2948,
+  [SMALL_STATE(143)] = 2961,
+  [SMALL_STATE(144)] = 2972,
+  [SMALL_STATE(145)] = 2985,
+  [SMALL_STATE(146)] = 2998,
+  [SMALL_STATE(147)] = 3011,
+  [SMALL_STATE(148)] = 3024,
+  [SMALL_STATE(149)] = 3037,
+  [SMALL_STATE(150)] = 3050,
+  [SMALL_STATE(151)] = 3063,
+  [SMALL_STATE(152)] = 3076,
+  [SMALL_STATE(153)] = 3089,
+  [SMALL_STATE(154)] = 3102,
+  [SMALL_STATE(155)] = 3115,
+  [SMALL_STATE(156)] = 3128,
+  [SMALL_STATE(157)] = 3141,
+  [SMALL_STATE(158)] = 3154,
+  [SMALL_STATE(159)] = 3167,
+  [SMALL_STATE(160)] = 3180,
+  [SMALL_STATE(161)] = 3193,
+  [SMALL_STATE(162)] = 3206,
+  [SMALL_STATE(163)] = 3219,
+  [SMALL_STATE(164)] = 3232,
+  [SMALL_STATE(165)] = 3245,
+  [SMALL_STATE(166)] = 3258,
+  [SMALL_STATE(167)] = 3271,
+  [SMALL_STATE(168)] = 3284,
+  [SMALL_STATE(169)] = 3297,
+  [SMALL_STATE(170)] = 3310,
+  [SMALL_STATE(171)] = 3323,
+  [SMALL_STATE(172)] = 3336,
+  [SMALL_STATE(173)] = 3347,
+  [SMALL_STATE(174)] = 3360,
+  [SMALL_STATE(175)] = 3373,
+  [SMALL_STATE(176)] = 3386,
+  [SMALL_STATE(177)] = 3399,
+  [SMALL_STATE(178)] = 3412,
+  [SMALL_STATE(179)] = 3425,
+  [SMALL_STATE(180)] = 3438,
+  [SMALL_STATE(181)] = 3451,
+  [SMALL_STATE(182)] = 3464,
+  [SMALL_STATE(183)] = 3477,
+  [SMALL_STATE(184)] = 3490,
+  [SMALL_STATE(185)] = 3501,
+  [SMALL_STATE(186)] = 3514,
+  [SMALL_STATE(187)] = 3527,
+  [SMALL_STATE(188)] = 3540,
+  [SMALL_STATE(189)] = 3553,
+  [SMALL_STATE(190)] = 3564,
+  [SMALL_STATE(191)] = 3577,
+  [SMALL_STATE(192)] = 3587,
+  [SMALL_STATE(193)] = 3597,
+  [SMALL_STATE(194)] = 3607,
+  [SMALL_STATE(195)] = 3617,
+  [SMALL_STATE(196)] = 3625,
+  [SMALL_STATE(197)] = 3635,
+  [SMALL_STATE(198)] = 3643,
+  [SMALL_STATE(199)] = 3651,
+  [SMALL_STATE(200)] = 3661,
+  [SMALL_STATE(201)] = 3669,
+  [SMALL_STATE(202)] = 3679,
+  [SMALL_STATE(203)] = 3689,
+  [SMALL_STATE(204)] = 3699,
+  [SMALL_STATE(205)] = 3709,
+  [SMALL_STATE(206)] = 3717,
+  [SMALL_STATE(207)] = 3727,
+  [SMALL_STATE(208)] = 3737,
+  [SMALL_STATE(209)] = 3745,
+  [SMALL_STATE(210)] = 3755,
+  [SMALL_STATE(211)] = 3763,
+  [SMALL_STATE(212)] = 3773,
+  [SMALL_STATE(213)] = 3783,
+  [SMALL_STATE(214)] = 3793,
+  [SMALL_STATE(215)] = 3801,
+  [SMALL_STATE(216)] = 3811,
+  [SMALL_STATE(217)] = 3821,
+  [SMALL_STATE(218)] = 3831,
+  [SMALL_STATE(219)] = 3841,
+  [SMALL_STATE(220)] = 3849,
+  [SMALL_STATE(221)] = 3859,
+  [SMALL_STATE(222)] = 3867,
+  [SMALL_STATE(223)] = 3877,
+  [SMALL_STATE(224)] = 3887,
+  [SMALL_STATE(225)] = 3895,
+  [SMALL_STATE(226)] = 3903,
+  [SMALL_STATE(227)] = 3913,
+  [SMALL_STATE(228)] = 3923,
+  [SMALL_STATE(229)] = 3933,
+  [SMALL_STATE(230)] = 3943,
+  [SMALL_STATE(231)] = 3953,
+  [SMALL_STATE(232)] = 3963,
+  [SMALL_STATE(233)] = 3973,
+  [SMALL_STATE(234)] = 3981,
+  [SMALL_STATE(235)] = 3991,
+  [SMALL_STATE(236)] = 4001,
+  [SMALL_STATE(237)] = 4009,
+  [SMALL_STATE(238)] = 4017,
+  [SMALL_STATE(239)] = 4027,
+  [SMALL_STATE(240)] = 4037,
+  [SMALL_STATE(241)] = 4047,
+  [SMALL_STATE(242)] = 4057,
+  [SMALL_STATE(243)] = 4065,
+  [SMALL_STATE(244)] = 4075,
+  [SMALL_STATE(245)] = 4082,
+  [SMALL_STATE(246)] = 4089,
+  [SMALL_STATE(247)] = 4096,
+  [SMALL_STATE(248)] = 4103,
+  [SMALL_STATE(249)] = 4110,
+  [SMALL_STATE(250)] = 4117,
+  [SMALL_STATE(251)] = 4124,
+  [SMALL_STATE(252)] = 4131,
+  [SMALL_STATE(253)] = 4138,
+  [SMALL_STATE(254)] = 4145,
+  [SMALL_STATE(255)] = 4152,
+  [SMALL_STATE(256)] = 4159,
+  [SMALL_STATE(257)] = 4166,
+  [SMALL_STATE(258)] = 4173,
+  [SMALL_STATE(259)] = 4180,
+  [SMALL_STATE(260)] = 4187,
+  [SMALL_STATE(261)] = 4194,
+  [SMALL_STATE(262)] = 4201,
+  [SMALL_STATE(263)] = 4208,
+  [SMALL_STATE(264)] = 4215,
+  [SMALL_STATE(265)] = 4222,
+  [SMALL_STATE(266)] = 4229,
+  [SMALL_STATE(267)] = 4236,
+  [SMALL_STATE(268)] = 4243,
+  [SMALL_STATE(269)] = 4250,
+  [SMALL_STATE(270)] = 4257,
+  [SMALL_STATE(271)] = 4264,
+  [SMALL_STATE(272)] = 4271,
+  [SMALL_STATE(273)] = 4278,
+  [SMALL_STATE(274)] = 4285,
+  [SMALL_STATE(275)] = 4292,
+  [SMALL_STATE(276)] = 4299,
+  [SMALL_STATE(277)] = 4306,
+  [SMALL_STATE(278)] = 4313,
+  [SMALL_STATE(279)] = 4320,
+  [SMALL_STATE(280)] = 4327,
+  [SMALL_STATE(281)] = 4334,
+  [SMALL_STATE(282)] = 4341,
+  [SMALL_STATE(283)] = 4348,
+  [SMALL_STATE(284)] = 4355,
+  [SMALL_STATE(285)] = 4362,
+  [SMALL_STATE(286)] = 4369,
+  [SMALL_STATE(287)] = 4376,
+  [SMALL_STATE(288)] = 4383,
+  [SMALL_STATE(289)] = 4390,
+  [SMALL_STATE(290)] = 4397,
+  [SMALL_STATE(291)] = 4404,
+  [SMALL_STATE(292)] = 4411,
+  [SMALL_STATE(293)] = 4418,
+  [SMALL_STATE(294)] = 4425,
+  [SMALL_STATE(295)] = 4432,
+  [SMALL_STATE(296)] = 4439,
+  [SMALL_STATE(297)] = 4446,
+  [SMALL_STATE(298)] = 4453,
+  [SMALL_STATE(299)] = 4460,
+  [SMALL_STATE(300)] = 4467,
+  [SMALL_STATE(301)] = 4474,
+  [SMALL_STATE(302)] = 4481,
+  [SMALL_STATE(303)] = 4488,
+  [SMALL_STATE(304)] = 4495,
+  [SMALL_STATE(305)] = 4502,
+  [SMALL_STATE(306)] = 4509,
+  [SMALL_STATE(307)] = 4516,
+  [SMALL_STATE(308)] = 4523,
+  [SMALL_STATE(309)] = 4530,
+  [SMALL_STATE(310)] = 4537,
+  [SMALL_STATE(311)] = 4544,
+  [SMALL_STATE(312)] = 4551,
+  [SMALL_STATE(313)] = 4558,
+  [SMALL_STATE(314)] = 4565,
+  [SMALL_STATE(315)] = 4572,
+  [SMALL_STATE(316)] = 4579,
+  [SMALL_STATE(317)] = 4586,
+  [SMALL_STATE(318)] = 4593,
+  [SMALL_STATE(319)] = 4600,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -7528,412 +7306,392 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
   [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
   [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 0, 0, 0),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(306),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(116),
-  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
-  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(111),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(305),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(307),
-  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(308),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(108),
+  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(104),
+  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(103),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(299),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(300),
+  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(304),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(95),
   [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(310),
   [31] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_list, 3, 0, 0),
-  [33] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_list, 2, 0, 0),
-  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
-  [37] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(174),
+  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [35] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_list, 2, 0, 0),
+  [37] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(190),
   [40] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0),
-  [42] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(177),
-  [45] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(178),
-  [48] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(179),
-  [51] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(270),
-  [54] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(269),
-  [57] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(268),
-  [60] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(260),
-  [63] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(266),
-  [66] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(265),
-  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
-  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
-  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
-  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
-  [89] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
-  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [93] = {.entry = {.count = 1, .reusable = false}}, SHIFT(143),
-  [95] = {.entry = {.count = 1, .reusable = false}}, SHIFT(264),
-  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [99] = {.entry = {.count = 1, .reusable = false}}, SHIFT(328),
-  [101] = {.entry = {.count = 1, .reusable = false}}, SHIFT(320),
-  [103] = {.entry = {.count = 1, .reusable = false}}, SHIFT(321),
-  [105] = {.entry = {.count = 1, .reusable = false}}, SHIFT(322),
-  [107] = {.entry = {.count = 1, .reusable = false}}, SHIFT(323),
-  [109] = {.entry = {.count = 1, .reusable = false}}, SHIFT(290),
-  [111] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(143),
-  [114] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(264),
-  [117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
-  [119] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(328),
-  [122] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(320),
-  [125] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(321),
-  [128] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(322),
-  [131] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(323),
-  [134] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(290),
+  [42] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(159),
+  [45] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(179),
+  [48] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(161),
+  [51] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(264),
+  [54] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(263),
+  [57] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(262),
+  [60] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(261),
+  [63] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(260),
+  [66] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_world_body_repeat1, 2, 0, 0), SHIFT_REPEAT(259),
+  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
+  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
+  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [81] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
+  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [89] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [93] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(130),
+  [96] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(253),
+  [99] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0),
+  [101] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(316),
+  [104] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(306),
+  [107] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(307),
+  [110] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(308),
+  [113] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(309),
+  [116] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interface_body_repeat1, 2, 0, 0), SHIFT_REPEAT(284),
+  [119] = {.entry = {.count = 1, .reusable = false}}, SHIFT(130),
+  [121] = {.entry = {.count = 1, .reusable = false}}, SHIFT(253),
+  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [125] = {.entry = {.count = 1, .reusable = false}}, SHIFT(316),
+  [127] = {.entry = {.count = 1, .reusable = false}}, SHIFT(306),
+  [129] = {.entry = {.count = 1, .reusable = false}}, SHIFT(307),
+  [131] = {.entry = {.count = 1, .reusable = false}}, SHIFT(308),
+  [133] = {.entry = {.count = 1, .reusable = false}}, SHIFT(309),
+  [135] = {.entry = {.count = 1, .reusable = false}}, SHIFT(284),
   [137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
   [139] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_body, 3, 0, 14),
-  [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
   [143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_item, 2, 0, 12),
-  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
   [147] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_body, 2, 0, 0),
-  [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
   [151] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_item, 2, 0, 12),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [155] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_items, 3, 0, 12),
-  [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_body, 5, 0, 42),
-  [159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extern_type, 2, 0, 0),
-  [161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_body, 2, 0, 0),
-  [163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_body, 2, 0, 0),
-  [165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_body, 2, 0, 0),
-  [167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 2, 0, 0),
-  [169] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_item, 5, 0, 22),
-  [171] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 2, 0, 0),
-  [173] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 3, 0, 23),
-  [175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 3, 0, 24),
-  [177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_body, 3, 0, 25),
-  [179] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_item, 4, 0, 17),
-  [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_body, 3, 0, 26),
-  [183] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_item, 4, 0, 12),
-  [185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_body, 3, 0, 0),
-  [187] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_export_item, 4, 0, 12),
-  [189] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_body, 3, 0, 29),
-  [191] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 4, 0, 32),
-  [193] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_item, 3, 0, 16),
-  [195] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_item, 3, 0, 12),
-  [197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 4, 0, 33),
-  [199] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_items, 3, 0, 2),
-  [201] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_body, 4, 0, 34),
-  [203] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_items, 3, 0, 2),
-  [205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_body, 4, 0, 35),
-  [207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 3),
-  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 4),
-  [211] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 5),
-  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 6),
-  [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 7),
-  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typedef_item, 1, 0, 0),
-  [219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_item, 3, 0, 2),
-  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_item, 3, 0, 15),
-  [223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_item, 3, 0, 0),
-  [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_export_item, 3, 0, 0),
-  [227] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_item, 7, 0, 0),
-  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 5, 0, 41),
-  [231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 5, 0, 40),
-  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_body, 5, 0, 43),
-  [235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 5, 0, 40),
-  [237] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_item, 3, 0, 12),
-  [239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func_item, 4, 0, 18),
-  [241] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_item, 4, 0, 18),
-  [243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_body, 3, 0, 26),
-  [245] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_body, 5, 0, 43),
-  [247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_body, 5, 0, 42),
-  [249] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_body, 3, 0, 25),
-  [251] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 3, 0, 24),
-  [253] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 3, 0, 23),
-  [255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 5, 0, 41),
-  [257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_item, 5, 0, 22),
-  [259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_body, 2, 0, 0),
-  [261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 4, 0, 32),
-  [263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_body, 2, 0, 0),
-  [265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_body, 2, 0, 0),
-  [267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 2, 0, 0),
-  [269] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 2, 0, 0),
-  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 4, 0, 33),
-  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_item, 3, 0, 16),
-  [275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_body, 4, 0, 34),
-  [277] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typedef_item, 1, 0, 0),
-  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_body, 3, 0, 0),
-  [281] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_items, 3, 0, 12),
-  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_items, 3, 0, 2),
-  [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_items, 3, 0, 2),
-  [287] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 10),
-  [289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 10),
-  [291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 9),
-  [293] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 9),
-  [295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_item, 3, 0, 2),
-  [297] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_body, 4, 0, 35),
-  [299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_use_item, 7, 0, 0),
-  [301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 8),
-  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 8),
-  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [307] = {.entry = {.count = 1, .reusable = false}}, SHIFT(279),
-  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
-  [311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 2, 0, 0),
-  [313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1, 0, 0),
-  [315] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 2, 0, 0),
-  [317] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0),
-  [319] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(146),
-  [322] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(306),
-  [325] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(299),
-  [328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(295),
-  [330] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 3, 0, 0),
-  [332] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0), SHIFT_REPEAT(279),
-  [335] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0),
-  [337] = {.entry = {.count = 1, .reusable = false}}, SHIFT(304),
-  [339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [341] = {.entry = {.count = 1, .reusable = false}}, SHIFT(206),
-  [343] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0),
-  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 1, 0, 0),
-  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [355] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0), SHIFT_REPEAT(304),
-  [358] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0),
-  [360] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0), SHIFT_REPEAT(206),
-  [363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ty, 1, 0, 0),
-  [365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 4, 0, 0),
-  [367] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0),
-  [369] = {.entry = {.count = 1, .reusable = false}}, SHIFT(205),
-  [371] = {.entry = {.count = 1, .reusable = false}}, SHIFT(210),
-  [373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 4, 0, 0),
-  [375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_option, 4, 0, 0),
-  [377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 1, 0, 0),
-  [379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 4, 0, 0),
-  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
-  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [385] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 6, 0, 0),
-  [387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_handle, 4, 0, 0),
-  [389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 4, 0, 0),
-  [391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_body, 3, 0, 13),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
-  [395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 7, 0, 0),
-  [399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 4, 0, 0),
-  [401] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_item, 3, 0, 2),
-  [403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_toplevel_use_item, 5, 0, 11),
-  [405] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_item, 3, 0, 2),
-  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 6, 0, 0),
-  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
-  [411] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
-  [413] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 5, 0, 0),
-  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [417] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 5, 0, 0),
-  [419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_toplevel_use_item, 3, 0, 1),
-  [421] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_body, 2, 0, 0),
-  [423] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [425] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [427] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
-  [429] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [431] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_type, 2, 0, 19),
-  [433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [437] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
-  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
-  [441] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_item, 1, 0, 0),
-  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [445] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 1, 0, 20),
-  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
-  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
-  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 1, 0, 21),
-  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [459] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 1, 0, 0),
-  [461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 1, 0, 0),
-  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [467] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [469] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_case, 1, 0, 18),
-  [471] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
-  [477] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
-  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
-  [485] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
-  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
-  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
-  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
-  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
-  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
-  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
-  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [529] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327),
-  [531] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [535] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
-  [537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 1, 0, 0),
-  [539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
-  [541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [543] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 5, 0, 0),
-  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 5, 0, 0),
-  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 2, 0, 20),
-  [549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 2, 0, 28),
-  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [553] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_list_repeat1, 2, 0, 0), SHIFT_REPEAT(14),
-  [556] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_list_repeat1, 2, 0, 0),
-  [558] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 2, 0, 21),
-  [560] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 2, 0, 30),
-  [562] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
-  [564] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [566] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_list, 1, 0, 0),
-  [568] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_named_type_list_repeat1, 2, 0, 0), SHIFT_REPEAT(257),
-  [571] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_named_type_list_repeat1, 2, 0, 0),
-  [573] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 3, 0, 0),
-  [575] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 37),
-  [577] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 37), SHIFT_REPEAT(250),
-  [580] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [582] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_variant_body_repeat1, 2, 0, 0),
-  [584] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_variant_body_repeat1, 2, 0, 0), SHIFT_REPEAT(241),
-  [587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [589] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 39),
-  [591] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 39), SHIFT_REPEAT(251),
-  [594] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [596] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 3, 0, 0),
-  [598] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 3, 0, 0),
-  [600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [602] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_body_repeat1, 2, 0, 0),
-  [604] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_record_body_repeat1, 2, 0, 0), SHIFT_REPEAT(204),
-  [607] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 3, 0, 30),
-  [609] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 3, 0, 28),
-  [611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 2, 0, 0),
-  [613] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_flags_body_repeat1, 2, 0, 0),
-  [615] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_flags_body_repeat1, 2, 0, 0), SHIFT_REPEAT(298),
-  [618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [620] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [626] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
-  [630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [632] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_field, 3, 0, 31),
-  [634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
-  [636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
-  [638] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [640] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
-  [642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [646] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [650] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param_list, 3, 0, 0),
-  [652] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_item, 3, 0, 0),
-  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [656] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 36),
-  [658] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_item, 3, 0, 0),
-  [660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 38),
-  [662] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(220),
-  [668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [682] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_case, 4, 0, 31),
-  [684] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param_list, 2, 0, 0),
-  [686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(236),
-  [690] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type, 3, 0, 31),
-  [692] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
-  [696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
-  [704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [708] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0), SHIFT_REPEAT(288),
-  [711] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [713] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [715] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
-  [717] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
-  [719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [721] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
-  [723] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [725] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
-  [727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [729] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
-  [731] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
-  [733] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [735] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [737] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
-  [739] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_type, 3, 0, 27),
-  [741] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
-  [743] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [745] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [747] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
-  [749] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [751] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
-  [753] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [755] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0),
-  [757] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 4, 0, 0),
-  [759] = {.entry = {.count = 1, .reusable = true}}, SHIFT(226),
-  [761] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
-  [763] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [765] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
-  [767] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [769] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [771] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
-  [773] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 3, 0, 0),
-  [775] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [777] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
-  [779] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
-  [781] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [783] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [785] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
-  [787] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [789] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [791] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [793] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
-  [795] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
-  [797] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [799] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
-  [801] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [803] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [805] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [807] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
-  [809] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [811] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [813] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
-  [815] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [819] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
-  [821] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 2, 0, 0),
-  [823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [825] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [827] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [829] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
-  [831] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
-  [833] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
-  [835] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [837] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
-  [839] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [841] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
-  [843] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [845] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [847] = {.entry = {.count = 1, .reusable = true}}, SHIFT(329),
-  [849] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [155] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 4, 0, 30),
+  [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 5, 0, 36),
+  [159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 3, 0, 23),
+  [161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_item, 3, 0, 16),
+  [163] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_item, 3, 0, 12),
+  [165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_items, 3, 0, 12),
+  [167] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_items, 3, 0, 2),
+  [169] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 3, 0, 24),
+  [171] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_items, 3, 0, 2),
+  [173] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extern_type, 2, 0, 0),
+  [175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_item, 3, 0, 2),
+  [177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_body, 3, 0, 0),
+  [179] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_body, 3, 0, 0),
+  [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_item, 3, 0, 15),
+  [183] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_item, 4, 0, 17),
+  [185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_item, 3, 0, 0),
+  [187] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_export_item, 3, 0, 0),
+  [189] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_body, 3, 0, 0),
+  [191] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_body, 2, 0, 0),
+  [193] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_body, 3, 0, 27),
+  [195] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 3),
+  [197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 4),
+  [199] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 5),
+  [201] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 6),
+  [203] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_items, 1, 0, 7),
+  [205] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_typedef_item, 1, 0, 0),
+  [207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_item, 5, 0, 22),
+  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 5, 0, 37),
+  [211] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_body, 2, 0, 0),
+  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 4, 0, 31),
+  [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_item, 7, 0, 0),
+  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_export_item, 4, 0, 12),
+  [219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_flags_body, 2, 0, 0),
+  [221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_item, 4, 0, 12),
+  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_item, 3, 0, 2),
+  [225] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 5, 0, 36),
+  [227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_item, 5, 0, 22),
+  [229] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func_item, 4, 0, 18),
+  [231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_item, 4, 0, 18),
+  [233] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 5, 0, 37),
+  [235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_body, 2, 0, 0),
+  [237] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 2, 0, 0),
+  [239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_body, 3, 0, 0),
+  [241] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_body, 3, 0, 0),
+  [243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 10),
+  [245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 10),
+  [247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_body, 3, 0, 0),
+  [249] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 9),
+  [251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 9),
+  [253] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_items, 1, 0, 8),
+  [255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_items, 1, 0, 8),
+  [257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 2, 0, 0),
+  [259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 4, 0, 30),
+  [261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_typedef_item, 1, 0, 0),
+  [263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 4, 0, 31),
+  [265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_use_item, 7, 0, 0),
+  [267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_body, 3, 0, 24),
+  [269] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_item, 3, 0, 16),
+  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_body, 3, 0, 23),
+  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_flags_items, 3, 0, 2),
+  [275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variant_items, 3, 0, 2),
+  [277] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_enum_items, 3, 0, 12),
+  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_item, 3, 0, 12),
+  [281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1, 0, 0),
+  [283] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 2, 0, 0),
+  [285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0),
+  [287] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(140),
+  [290] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(298),
+  [293] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(291),
+  [296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [298] = {.entry = {.count = 1, .reusable = false}}, SHIFT(273),
+  [300] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 2, 0, 0),
+  [304] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 3, 0, 0),
+  [308] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0), SHIFT_REPEAT(273),
+  [311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0),
+  [313] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0), SHIFT_REPEAT(315),
+  [316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0),
+  [318] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_resource_body_repeat1, 2, 0, 0), SHIFT_REPEAT(239),
+  [321] = {.entry = {.count = 1, .reusable = false}}, SHIFT(315),
+  [323] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
+  [325] = {.entry = {.count = 1, .reusable = false}}, SHIFT(239),
+  [327] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [329] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 1, 0, 0),
+  [331] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [333] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [335] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat2, 2, 0, 0),
+  [337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_handle, 4, 0, 0),
+  [341] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 4, 0, 0),
+  [343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 4, 0, 0),
+  [345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
+  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ty, 1, 0, 0),
+  [351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_option, 4, 0, 0),
+  [353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0),
+  [355] = {.entry = {.count = 1, .reusable = false}}, SHIFT(226),
+  [357] = {.entry = {.count = 1, .reusable = false}}, SHIFT(223),
+  [359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list, 4, 0, 0),
+  [361] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result, 6, 0, 0),
+  [363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 1, 0, 0),
+  [365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 4, 0, 0),
+  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
+  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_toplevel_use_item, 5, 0, 11),
+  [373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 5, 0, 0),
+  [375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 6, 0, 0),
+  [377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 7, 0, 0),
+  [379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_path, 5, 0, 0),
+  [381] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_body, 2, 0, 0),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
+  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package_decl, 4, 0, 0),
+  [389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_item, 3, 0, 2),
+  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(210),
+  [393] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_item, 3, 0, 2),
+  [395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_toplevel_use_item, 3, 0, 1),
+  [397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_world_body, 3, 0, 13),
+  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [401] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
+  [405] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 3, 0, 26),
+  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_case, 1, 0, 18),
+  [413] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [415] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
+  [417] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_cases, 1, 0, 0),
+  [419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
+  [421] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_list_repeat1, 2, 0, 0), SHIFT_REPEAT(12),
+  [424] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_list_repeat1, 2, 0, 0),
+  [426] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_cases, 1, 0, 0),
+  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
+  [432] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_named_type_list_repeat1, 2, 0, 0), SHIFT_REPEAT(220),
+  [435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_named_type_list_repeat1, 2, 0, 0),
+  [437] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 3, 0, 0),
+  [439] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 1, 0, 0),
+  [441] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 1, 0, 0),
+  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [445] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_type, 2, 0, 19),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [449] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [451] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
+  [453] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_item, 1, 0, 0),
+  [455] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
+  [457] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [459] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 1, 0, 20),
+  [461] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [463] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [465] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
+  [467] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 35),
+  [469] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 35), SHIFT_REPEAT(241),
+  [472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
+  [476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 1, 0, 21),
+  [478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
+  [484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [490] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 3, 0, 28),
+  [492] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 33),
+  [494] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 33), SHIFT_REPEAT(240),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
+  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
+  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [507] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 2, 0, 0),
+  [509] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_cases, 2, 0, 0),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
+  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [515] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_cases, 2, 0, 0),
+  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
+  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
+  [523] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 3, 0, 0),
+  [525] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 3, 0, 0),
+  [527] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_cases_repeat1, 2, 0, 0),
+  [529] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(235),
+  [532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [536] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_cases, 3, 0, 0),
+  [538] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_variant_cases_repeat1, 2, 0, 0),
+  [540] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_variant_cases_repeat1, 2, 0, 0), SHIFT_REPEAT(234),
+  [543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type_list, 1, 0, 0),
+  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_cases, 3, 0, 0),
+  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
+  [551] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_flags_body_repeat1, 2, 0, 0),
+  [553] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_flags_body_repeat1, 2, 0, 0), SHIFT_REPEAT(247),
+  [556] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_body_repeat1, 2, 0, 0),
+  [558] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_record_body_repeat1, 2, 0, 0), SHIFT_REPEAT(232),
+  [561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 2, 0, 20),
+  [563] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_list, 2, 0, 26),
+  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [567] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_resource_method, 5, 0, 0),
+  [569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_resource_method, 5, 0, 0),
+  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [573] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 2, 0, 21),
+  [575] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_list, 2, 0, 28),
+  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [581] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_list, 1, 0, 0),
+  [583] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [585] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0), SHIFT_REPEAT(282),
+  [588] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [590] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [592] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [594] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_field, 3, 0, 29),
+  [596] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [598] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_case, 1, 0, 18),
+  [600] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [602] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [604] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
+  [606] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [608] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [610] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [612] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
+  [614] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [616] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [618] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [620] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param_list, 2, 0, 0),
+  [622] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [624] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [626] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param_list, 3, 0, 0),
+  [628] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [630] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
+  [632] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [634] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [636] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [638] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_names_item, 3, 0, 0),
+  [640] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_names_list_repeat1, 2, 0, 32),
+  [642] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [644] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_names_item, 3, 0, 0),
+  [646] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_include_names_list_repeat1, 2, 0, 34),
+  [648] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
+  [650] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [652] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [654] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [656] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [658] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [660] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variant_case, 4, 0, 29),
+  [662] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_named_type, 3, 0, 29),
+  [664] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [666] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [672] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 3, 0, 0),
+  [674] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
+  [676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [682] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
+  [684] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [686] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [688] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
+  [690] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [692] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 4, 0, 0),
+  [694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [696] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [698] = {.entry = {.count = 1, .reusable = true}}, SHIFT(201),
+  [700] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [702] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
+  [704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
+  [706] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_result_list, 2, 0, 0),
+  [710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
+  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [716] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [718] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [720] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [722] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [724] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [726] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_package_decl_repeat1, 2, 0, 0),
+  [728] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [730] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [732] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [734] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [736] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
+  [738] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [740] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [742] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func_type, 3, 0, 25),
+  [744] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(214),
+  [748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
+  [750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
+  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
+  [756] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
+  [758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [762] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [768] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
+  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
+  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(207),
+  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(212),
+  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
+  [792] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
+  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
+  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
+  [808] = {.entry = {.count = 1, .reusable = true}}, SHIFT(317),
+  [810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
 };
 
 #ifdef __cplusplus
diff --git a/test/corpus/design-doc-interface.txt b/test/corpus/design-doc-interface.txt
index 7975d43..87bec4b 100644
--- a/test/corpus/design-doc-interface.txt
+++ b/test/corpus/design-doc-interface.txt
@@ -74,24 +74,30 @@ interface foo {
           (variant_items
             (id)
             (variant_body
+             (variant_cases
               (variant_case
-                (id))
+               (id))
               (variant_case
-                (id)
-                (ty))
+               (id)
+               (ty))
               (comment)
               (variant_case
-                (id))))))
+               (id)))))))
       (comment)
       (interface_items
         (typedef_item
           (enum_items
             (id)
             (enum_body
-              (id)
-              (id)
-              (id)
-              (id)))))
+             (enum_cases
+              (enum_case
+               (id))
+              (enum_case
+               (id))
+              (enum_case
+               (id))
+              (enum_case
+               (id)))))))
       (comment)
       (interface_items
         (typedef_item
diff --git a/test/corpus/interfaces.txt b/test/corpus/interfaces.txt
index 9287af0..77e500e 100644
--- a/test/corpus/interfaces.txt
+++ b/test/corpus/interfaces.txt
@@ -146,14 +146,18 @@ interface foo {
           (enum_items
             name: (id)
             (enum_body
-              enum_cases: (id)
-              enum_cases: (id)))))
+              (enum_cases
+                (enum_case
+                  name: (id))
+                (enum_case
+                  name: (id)))))))
       interface_items: (interface_items
         typedef: (typedef_item
           (variant_items
             name: (id)
             body: (variant_body
-              variant_cases: (variant_case
-                name: (id))
-              variant_cases: (variant_case
-                name: (id)))))))))
+              (variant_cases
+                (variant_case
+                  name: (id))
+                (variant_case
+                  name: (id))))))))))