1 files changed, 20 insertions, 18 deletions
diff --git a/tools/tree-sitter/test/corpus/generic_arguments.txt b/tools/tree-sitter/test/corpus/generic_arguments.txt
index 3f325de..227efd9 100644
--- a/tools/tree-sitter/test/corpus/generic_arguments.txt
+++ b/tools/tree-sitter/test/corpus/generic_arguments.txt
@@ -24,8 +24,8 @@ return entry_ptr^.key
 
 begin
   entry.key := allocate#[File](#size(File));
-  assert(#size(Pair#[File, Word8]) = #size(Pointer) * 2u);
-  assert(#offset(Pair#[File, Word8], value) = #size(Pointer));
+  assert(#size(Pair#[File, Word8]) = #size(^Word8) * 2u);
+  assert(#offset(Pair#[File, Word8], value) = #size(^Word8));
   assert(first#[File, Word8](@entry) = entry.key)
 end.
 
@@ -39,23 +39,23 @@ end.
           (identifier))
         (record_type
           (field_declaration
-            (identifier_definition
+            (field_identifier
               (identifier))
             (identifier))))
       (type_declaration
         (identifier_definition
-          (identifier))
-        (type_parameters
           (identifier)
-          (identifier))
+          (type_parameters
+            (identifier)
+            (identifier)))
         (record_type
           (field_declaration
-            (identifier_definition
+            (field_identifier
               (identifier))
             (pointer_type
               (identifier)))
           (field_declaration
-            (identifier_definition
+            (field_identifier
               (identifier))
             (pointer_type
               (identifier))))))
@@ -70,25 +70,25 @@ end.
             (identifier)))))
     (procedure_declaration
       (identifier_definition
-        (identifier))
-      (type_parameters
-        (identifier))
+        (identifier)
+        (type_parameters
+          (identifier)))
       (parameter_list
         (field_declaration
-          (identifier_definition
+          (field_identifier
             (identifier))
           (identifier)))
       (pointer_type
         (identifier)))
     (procedure_declaration
       (identifier_definition
-        (identifier))
-      (type_parameters
         (identifier)
-        (identifier))
+        (type_parameters
+          (identifier)
+          (identifier)))
       (parameter_list
         (field_declaration
-          (identifier_definition
+          (field_identifier
             (identifier))
           (pointer_type
             (generic_type
@@ -131,7 +131,8 @@ end.
           (binary_expression
             (traits_expression
               (trait)
-              (identifier))
+              (pointer_type
+                (identifier)))
             (literal
               (integer))))))
     (call_expression
@@ -148,7 +149,8 @@ end.
             (identifier))
           (traits_expression
             (trait)
-            (identifier)))))
+            (pointer_type
+              (identifier))))))
     (call_expression
       (identifier)
       (argument_list