diff --git a/extractor/src/extractor.rs b/extractor/src/extractor.rs
index 980d9562519..1f282d8211c 100644
--- a/extractor/src/extractor.rs
+++ b/extractor/src/extractor.rs
@@ -328,11 +328,17 @@ impl Visitor<'_> {
         match &table.kind {
             EntryKind::Token { kind_id, .. } => {
                 self.trap_writer.add_tuple(
-                    "tokeninfo",
+                    "ast_node_parent",
                     vec![
                         Arg::Label(id),
                         Arg::Label(parent_id),
                         Arg::Int(parent_index),
+                    ],
+                );
+                self.trap_writer.add_tuple(
+                    "tokeninfo",
+                    vec![
+                        Arg::Label(id),
                         Arg::Int(*kind_id),
                         Arg::Label(self.file_label),
                         Arg::Int(self.token_counter),
@@ -347,10 +353,16 @@ impl Visitor<'_> {
                 name: table_name,
             } => {
                 if let Some(args) = self.complex_node(&node, fields, &child_nodes, id) {
+                    self.trap_writer.add_tuple(
+                        "ast_node_parent",
+                        vec![
+                            Arg::Label(id),
+                            Arg::Label(parent_id),
+                            Arg::Int(parent_index),
+                        ],
+                    );
                     let mut all_args = Vec::new();
                     all_args.push(Arg::Label(id));
-                    all_args.push(Arg::Label(parent_id));
-                    all_args.push(Arg::Int(parent_index));
                     all_args.extend(args);
                     all_args.push(Arg::Label(loc));
                     self.trap_writer.add_tuple(&table_name, all_args);
diff --git a/generator/src/main.rs b/generator/src/main.rs
index c9a59dbb871..b3e73c5a445 100644
--- a/generator/src/main.rs
+++ b/generator/src/main.rs
@@ -178,30 +178,14 @@ fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<dbscheme::Entry<
                 // It's a product type, defined by a table.
                 let mut main_table = dbscheme::Table {
                     name: &name,
-                    columns: vec![
-                        dbscheme::Column {
-                            db_type: dbscheme::DbColumnType::Int,
-                            name: "id",
-                            unique: true,
-                            ql_type: ql::Type::AtType(&node.dbscheme_name),
-                            ql_type_is_ref: false,
-                        },
-                        dbscheme::Column {
-                            db_type: dbscheme::DbColumnType::Int,
-                            name: "parent",
-                            unique: false,
-                            ql_type: ql::Type::AtType("ast_node_parent"),
-                            ql_type_is_ref: true,
-                        },
-                        dbscheme::Column {
-                            unique: false,
-                            db_type: dbscheme::DbColumnType::Int,
-                            name: "parent_index",
-                            ql_type: ql::Type::Int,
-                            ql_type_is_ref: true,
-                        },
-                    ],
-                    keysets: Some(vec!["parent", "parent_index"]),
+                    columns: vec![dbscheme::Column {
+                        db_type: dbscheme::DbColumnType::Int,
+                        name: "id",
+                        unique: true,
+                        ql_type: ql::Type::AtType(&node.dbscheme_name),
+                        ql_type_is_ref: false,
+                    }],
+                    keysets: None,
                 };
                 ast_node_members.insert(&node.dbscheme_name);
 
@@ -275,22 +259,21 @@ fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<dbscheme::Entry<
         name: "ast_node_parent",
         members: ["ast_node", "file"].iter().cloned().collect(),
     }));
+
+    entries.push(dbscheme::Entry::Table(create_ast_node_parent_table()));
+
     entries
 }
-
-fn create_tokeninfo<'a>(
-    token_kinds: Map<&'a str, usize>,
-) -> (dbscheme::Case<'a>, dbscheme::Table<'a>) {
-    let table = dbscheme::Table {
-        name: "tokeninfo",
-        keysets: Some(vec!["parent", "parent_index"]),
+fn create_ast_node_parent_table<'a>() -> dbscheme::Table<'a> {
+    dbscheme::Table {
+        name: "ast_node_parent",
         columns: vec![
             dbscheme::Column {
                 db_type: dbscheme::DbColumnType::Int,
-                name: "id",
-                unique: true,
-                ql_type: ql::Type::AtType("token"),
-                ql_type_is_ref: false,
+                name: "child",
+                unique: false,
+                ql_type: ql::Type::AtType("ast_node"),
+                ql_type_is_ref: true,
             },
             dbscheme::Column {
                 db_type: dbscheme::DbColumnType::Int,
@@ -306,6 +289,25 @@ fn create_tokeninfo<'a>(
                 ql_type: ql::Type::Int,
                 ql_type_is_ref: true,
             },
+        ],
+        keysets: Some(vec!["parent", "parent_index"]),
+    }
+}
+
+fn create_tokeninfo<'a>(
+    token_kinds: Map<&'a str, usize>,
+) -> (dbscheme::Case<'a>, dbscheme::Table<'a>) {
+    let table = dbscheme::Table {
+        name: "tokeninfo",
+        keysets: None,
+        columns: vec![
+            dbscheme::Column {
+                db_type: dbscheme::DbColumnType::Int,
+                name: "id",
+                unique: true,
+                ql_type: ql::Type::AtType("token"),
+                ql_type_is_ref: false,
+            },
             dbscheme::Column {
                 unique: false,
                 db_type: dbscheme::DbColumnType::Int,
diff --git a/generator/src/ql_gen.rs b/generator/src/ql_gen.rs
index 3a26c0ee018..fcdbe5541f7 100644
--- a/generator/src/ql_gen.rs
+++ b/generator/src/ql_gen.rs
@@ -75,33 +75,48 @@ fn create_ast_node_class<'a>() -> ql::Class<'a> {
 }
 
 fn create_token_class<'a>() -> ql::Class<'a> {
+    let tokeninfo_arity = 6;
     let get_parent = ql::Predicate {
         name: "getParent",
         overridden: true,
         return_type: Some(ql::Type::Normal("AstNode")),
         formal_parameters: vec![],
-        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 0, 8),
+        body: ql::Expression::Pred(
+            "ast_node_parent",
+            vec![
+                ql::Expression::Var("this"),
+                ql::Expression::Var("result"),
+                ql::Expression::Var("_"),
+            ],
+        ),
     };
     let get_parent_index = ql::Predicate {
         name: "getParentIndex",
         overridden: true,
         return_type: Some(ql::Type::Int),
         formal_parameters: vec![],
-        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 1, 8),
+        body: ql::Expression::Pred(
+            "ast_node_parent",
+            vec![
+                ql::Expression::Var("this"),
+                ql::Expression::Var("_"),
+                ql::Expression::Var("result"),
+            ],
+        ),
     };
     let get_value = ql::Predicate {
         name: "getValue",
         overridden: false,
         return_type: Some(ql::Type::String),
         formal_parameters: vec![],
-        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 5, 8),
+        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 3, tokeninfo_arity),
     };
     let get_location = ql::Predicate {
         name: "getLocation",
         overridden: true,
         return_type: Some(ql::Type::Normal("Location")),
         formal_parameters: vec![],
-        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 6, 8),
+        body: create_get_field_expr_for_column_storage("result", "tokeninfo", 4, tokeninfo_arity),
     };
     let to_string = ql::Predicate {
         name: "toString",
@@ -476,12 +491,10 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                 // Count how many columns there will be in the main table.
                 // There will be:
                 // - one for the id
-                // - one for the parent
-                // - one for the parent index
                 // - one for the location
                 // - one for each field that's stored as a column
                 // - if there are no fields, one for the text column.
-                let main_table_arity = 4 + if fields.is_empty() {
+                let main_table_arity = 2 + if fields.is_empty() {
                     1
                 } else {
                     fields
@@ -512,7 +525,7 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                         .predicates
                         .push(create_get_text_predicate(&main_table_name));
                 } else {
-                    let mut main_table_column_index: usize = 2;
+                    let mut main_table_column_index: usize = 0;
                     let mut get_child_exprs: Vec<ql::Expression> = Vec::new();
 
                     // Iterate through the fields, creating:
@@ -538,11 +551,13 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                         overridden: true,
                         return_type: Some(ql::Type::Normal("AstNode")),
                         formal_parameters: vec![],
-                        body: create_get_field_expr_for_column_storage(
-                            "result",
-                            &main_table_name,
-                            0,
-                            main_table_arity,
+                        body: ql::Expression::Pred(
+                            "ast_node_parent",
+                            vec![
+                                ql::Expression::Var("this"),
+                                ql::Expression::Var("result"),
+                                ql::Expression::Var("_"),
+                            ],
                         ),
                     });
 
@@ -551,11 +566,13 @@ pub fn convert_nodes<'a>(nodes: &'a node_types::NodeTypeMap) -> Vec<ql::TopLevel
                         overridden: true,
                         return_type: Some(ql::Type::Int),
                         formal_parameters: vec![],
-                        body: create_get_field_expr_for_column_storage(
-                            "result",
-                            &main_table_name,
-                            1,
-                            main_table_arity,
+                        body: ql::Expression::Pred(
+                            "ast_node_parent",
+                            vec![
+                                ql::Expression::Var("this"),
+                                ql::Expression::Var("_"),
+                                ql::Expression::Var("result"),
+                            ],
                         ),
                     });
 
diff --git a/ql/src/codeql_ruby/ast/internal/TreeSitter.qll b/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
index 492b03b4b52..b3646e59a3a 100644
--- a/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
+++ b/ql/src/codeql_ruby/ast/internal/TreeSitter.qll
@@ -22,13 +22,13 @@ module Generated {
   }
 
   class Token extends @token, AstNode {
-    override AstNode getParent() { tokeninfo(this, result, _, _, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { tokeninfo(this, _, result, _, _, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    string getValue() { tokeninfo(this, _, _, _, _, _, result, _) }
+    string getValue() { tokeninfo(this, _, _, _, result, _) }
 
-    override Location getLocation() { tokeninfo(this, _, _, _, _, _, _, result) }
+    override Location getLocation() { tokeninfo(this, _, _, _, _, result) }
 
     override string toString() { result = getValue() }
 
@@ -54,31 +54,31 @@ module Generated {
   class Alias extends @alias, AstNode {
     override string getAPrimaryQlClass() { result = "Alias" }
 
-    override Location getLocation() { alias_def(this, _, _, _, _, result) }
+    override Location getLocation() { alias_def(this, _, _, result) }
 
-    UnderscoreMethodName getAlias() { alias_def(this, _, _, result, _, _) }
+    UnderscoreMethodName getAlias() { alias_def(this, result, _, _) }
 
-    UnderscoreMethodName getName() { alias_def(this, _, _, _, result, _) }
+    UnderscoreMethodName getName() { alias_def(this, _, result, _) }
 
-    override AstNode getParent() { alias_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { alias_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      alias_def(this, _, _, result, _, _) or alias_def(this, _, _, _, result, _)
+      alias_def(this, result, _, _) or alias_def(this, _, result, _)
     }
   }
 
   class ArgumentList extends @argument_list, AstNode {
     override string getAPrimaryQlClass() { result = "ArgumentList" }
 
-    override Location getLocation() { argument_list_def(this, _, _, result) }
+    override Location getLocation() { argument_list_def(this, result) }
 
     AstNode getChild(int i) { argument_list_child(this, i, result) }
 
-    override AstNode getParent() { argument_list_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { argument_list_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { argument_list_child(this, _, result) }
   }
@@ -86,13 +86,13 @@ module Generated {
   class Array extends @array, AstNode {
     override string getAPrimaryQlClass() { result = "Array" }
 
-    override Location getLocation() { array_def(this, _, _, result) }
+    override Location getLocation() { array_def(this, result) }
 
     AstNode getChild(int i) { array_child(this, i, result) }
 
-    override AstNode getParent() { array_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { array_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { array_child(this, _, result) }
   }
@@ -100,31 +100,31 @@ module Generated {
   class Assignment extends @assignment, AstNode {
     override string getAPrimaryQlClass() { result = "Assignment" }
 
-    override Location getLocation() { assignment_def(this, _, _, _, _, result) }
+    override Location getLocation() { assignment_def(this, _, _, result) }
 
-    AstNode getLeft() { assignment_def(this, _, _, result, _, _) }
+    AstNode getLeft() { assignment_def(this, result, _, _) }
 
-    AstNode getRight() { assignment_def(this, _, _, _, result, _) }
+    AstNode getRight() { assignment_def(this, _, result, _) }
 
-    override AstNode getParent() { assignment_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { assignment_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      assignment_def(this, _, _, result, _, _) or assignment_def(this, _, _, _, result, _)
+      assignment_def(this, result, _, _) or assignment_def(this, _, result, _)
     }
   }
 
   class BareString extends @bare_string, AstNode {
     override string getAPrimaryQlClass() { result = "BareString" }
 
-    override Location getLocation() { bare_string_def(this, _, _, result) }
+    override Location getLocation() { bare_string_def(this, result) }
 
     AstNode getChild(int i) { bare_string_child(this, i, result) }
 
-    override AstNode getParent() { bare_string_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { bare_string_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { bare_string_child(this, _, result) }
   }
@@ -132,13 +132,13 @@ module Generated {
   class BareSymbol extends @bare_symbol, AstNode {
     override string getAPrimaryQlClass() { result = "BareSymbol" }
 
-    override Location getLocation() { bare_symbol_def(this, _, _, result) }
+    override Location getLocation() { bare_symbol_def(this, result) }
 
     AstNode getChild(int i) { bare_symbol_child(this, i, result) }
 
-    override AstNode getParent() { bare_symbol_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { bare_symbol_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { bare_symbol_child(this, _, result) }
   }
@@ -146,13 +146,13 @@ module Generated {
   class Begin extends @begin, AstNode {
     override string getAPrimaryQlClass() { result = "Begin" }
 
-    override Location getLocation() { begin_def(this, _, _, result) }
+    override Location getLocation() { begin_def(this, result) }
 
     AstNode getChild(int i) { begin_child(this, i, result) }
 
-    override AstNode getParent() { begin_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { begin_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { begin_child(this, _, result) }
   }
@@ -160,13 +160,13 @@ module Generated {
   class BeginBlock extends @begin_block, AstNode {
     override string getAPrimaryQlClass() { result = "BeginBlock" }
 
-    override Location getLocation() { begin_block_def(this, _, _, result) }
+    override Location getLocation() { begin_block_def(this, result) }
 
     AstNode getChild(int i) { begin_block_child(this, i, result) }
 
-    override AstNode getParent() { begin_block_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { begin_block_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { begin_block_child(this, _, result) }
   }
@@ -174,12 +174,12 @@ module Generated {
   class Binary extends @binary, AstNode {
     override string getAPrimaryQlClass() { result = "Binary" }
 
-    override Location getLocation() { binary_def(this, _, _, _, _, _, result) }
+    override Location getLocation() { binary_def(this, _, _, _, result) }
 
-    AstNode getLeft() { binary_def(this, _, _, result, _, _, _) }
+    AstNode getLeft() { binary_def(this, result, _, _, _) }
 
     string getOperator() {
-      exists(int value | binary_def(this, _, _, _, value, _, _) |
+      exists(int value | binary_def(this, _, value, _, _) |
         result = "!=" and value = 0
         or
         result = "!~" and value = 1
@@ -232,29 +232,29 @@ module Generated {
       )
     }
 
-    AstNode getRight() { binary_def(this, _, _, _, _, result, _) }
+    AstNode getRight() { binary_def(this, _, _, result, _) }
 
-    override AstNode getParent() { binary_def(this, result, _, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { binary_def(this, _, result, _, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      binary_def(this, _, _, result, _, _, _) or binary_def(this, _, _, _, _, result, _)
+      binary_def(this, result, _, _, _) or binary_def(this, _, _, result, _)
     }
   }
 
   class Block extends @block, AstNode {
     override string getAPrimaryQlClass() { result = "Block" }
 
-    override Location getLocation() { block_def(this, _, _, result) }
+    override Location getLocation() { block_def(this, result) }
 
     BlockParameters getParameters() { block_parameters(this, result) }
 
     AstNode getChild(int i) { block_child(this, i, result) }
 
-    override AstNode getParent() { block_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { block_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       block_parameters(this, result) or block_child(this, _, result)
@@ -264,41 +264,41 @@ module Generated {
   class BlockArgument extends @block_argument, AstNode {
     override string getAPrimaryQlClass() { result = "BlockArgument" }
 
-    override Location getLocation() { block_argument_def(this, _, _, _, result) }
+    override Location getLocation() { block_argument_def(this, _, result) }
 
-    UnderscoreArg getChild() { block_argument_def(this, _, _, result, _) }
+    UnderscoreArg getChild() { block_argument_def(this, result, _) }
 
-    override AstNode getParent() { block_argument_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { block_argument_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { block_argument_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { block_argument_def(this, result, _) }
   }
 
   class BlockParameter extends @block_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "BlockParameter" }
 
-    override Location getLocation() { block_parameter_def(this, _, _, _, result) }
+    override Location getLocation() { block_parameter_def(this, _, result) }
 
-    Identifier getName() { block_parameter_def(this, _, _, result, _) }
+    Identifier getName() { block_parameter_def(this, result, _) }
 
-    override AstNode getParent() { block_parameter_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { block_parameter_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { block_parameter_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { block_parameter_def(this, result, _) }
   }
 
   class BlockParameters extends @block_parameters, AstNode {
     override string getAPrimaryQlClass() { result = "BlockParameters" }
 
-    override Location getLocation() { block_parameters_def(this, _, _, result) }
+    override Location getLocation() { block_parameters_def(this, result) }
 
     AstNode getChild(int i) { block_parameters_child(this, i, result) }
 
-    override AstNode getParent() { block_parameters_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { block_parameters_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { block_parameters_child(this, _, result) }
   }
@@ -306,13 +306,13 @@ module Generated {
   class Break extends @break, AstNode {
     override string getAPrimaryQlClass() { result = "Break" }
 
-    override Location getLocation() { break_def(this, _, _, result) }
+    override Location getLocation() { break_def(this, result) }
 
     ArgumentList getChild() { break_child(this, result) }
 
-    override AstNode getParent() { break_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { break_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { break_child(this, result) }
   }
@@ -320,24 +320,24 @@ module Generated {
   class Call extends @call, AstNode {
     override string getAPrimaryQlClass() { result = "Call" }
 
-    override Location getLocation() { call_def(this, _, _, _, result) }
+    override Location getLocation() { call_def(this, _, result) }
 
     ArgumentList getArguments() { call_arguments(this, result) }
 
     AstNode getBlock() { call_block(this, result) }
 
-    AstNode getMethod() { call_def(this, _, _, result, _) }
+    AstNode getMethod() { call_def(this, result, _) }
 
     AstNode getReceiver() { call_receiver(this, result) }
 
-    override AstNode getParent() { call_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { call_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       call_arguments(this, result) or
       call_block(this, result) or
-      call_def(this, _, _, result, _) or
+      call_def(this, result, _) or
       call_receiver(this, result)
     }
   }
@@ -345,15 +345,15 @@ module Generated {
   class Case extends @case__, AstNode {
     override string getAPrimaryQlClass() { result = "Case" }
 
-    override Location getLocation() { case_def(this, _, _, result) }
+    override Location getLocation() { case_def(this, result) }
 
     UnderscoreStatement getValue() { case_value(this, result) }
 
     AstNode getChild(int i) { case_child(this, i, result) }
 
-    override AstNode getParent() { case_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { case_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { case_value(this, result) or case_child(this, _, result) }
   }
@@ -361,13 +361,13 @@ module Generated {
   class ChainedString extends @chained_string, AstNode {
     override string getAPrimaryQlClass() { result = "ChainedString" }
 
-    override Location getLocation() { chained_string_def(this, _, _, result) }
+    override Location getLocation() { chained_string_def(this, result) }
 
     String getChild(int i) { chained_string_child(this, i, result) }
 
-    override AstNode getParent() { chained_string_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { chained_string_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { chained_string_child(this, _, result) }
   }
@@ -379,22 +379,20 @@ module Generated {
   class Class extends @class, AstNode {
     override string getAPrimaryQlClass() { result = "Class" }
 
-    override Location getLocation() { class_def(this, _, _, _, result) }
+    override Location getLocation() { class_def(this, _, result) }
 
-    AstNode getName() { class_def(this, _, _, result, _) }
+    AstNode getName() { class_def(this, result, _) }
 
     Superclass getSuperclass() { class_superclass(this, result) }
 
     AstNode getChild(int i) { class_child(this, i, result) }
 
-    override AstNode getParent() { class_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { class_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      class_def(this, _, _, result, _) or
-      class_superclass(this, result) or
-      class_child(this, _, result)
+      class_def(this, result, _) or class_superclass(this, result) or class_child(this, _, result)
     }
   }
 
@@ -413,22 +411,22 @@ module Generated {
   class Conditional extends @conditional, AstNode {
     override string getAPrimaryQlClass() { result = "Conditional" }
 
-    override Location getLocation() { conditional_def(this, _, _, _, _, _, result) }
+    override Location getLocation() { conditional_def(this, _, _, _, result) }
 
-    UnderscoreArg getAlternative() { conditional_def(this, _, _, result, _, _, _) }
+    UnderscoreArg getAlternative() { conditional_def(this, result, _, _, _) }
 
-    UnderscoreArg getCondition() { conditional_def(this, _, _, _, result, _, _) }
+    UnderscoreArg getCondition() { conditional_def(this, _, result, _, _) }
 
-    UnderscoreArg getConsequence() { conditional_def(this, _, _, _, _, result, _) }
+    UnderscoreArg getConsequence() { conditional_def(this, _, _, result, _) }
 
-    override AstNode getParent() { conditional_def(this, result, _, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { conditional_def(this, _, result, _, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      conditional_def(this, _, _, result, _, _, _) or
-      conditional_def(this, _, _, _, result, _, _) or
-      conditional_def(this, _, _, _, _, result, _)
+      conditional_def(this, result, _, _, _) or
+      conditional_def(this, _, result, _, _) or
+      conditional_def(this, _, _, result, _)
     }
   }
 
@@ -439,13 +437,13 @@ module Generated {
   class DelimitedSymbol extends @delimited_symbol, AstNode {
     override string getAPrimaryQlClass() { result = "DelimitedSymbol" }
 
-    override Location getLocation() { delimited_symbol_def(this, _, _, result) }
+    override Location getLocation() { delimited_symbol_def(this, result) }
 
     AstNode getChild(int i) { delimited_symbol_child(this, i, result) }
 
-    override AstNode getParent() { delimited_symbol_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { delimited_symbol_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { delimited_symbol_child(this, _, result) }
   }
@@ -453,13 +451,13 @@ module Generated {
   class DestructuredLeftAssignment extends @destructured_left_assignment, AstNode {
     override string getAPrimaryQlClass() { result = "DestructuredLeftAssignment" }
 
-    override Location getLocation() { destructured_left_assignment_def(this, _, _, result) }
+    override Location getLocation() { destructured_left_assignment_def(this, result) }
 
     AstNode getChild(int i) { destructured_left_assignment_child(this, i, result) }
 
-    override AstNode getParent() { destructured_left_assignment_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { destructured_left_assignment_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { destructured_left_assignment_child(this, _, result) }
   }
@@ -467,13 +465,13 @@ module Generated {
   class DestructuredParameter extends @destructured_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "DestructuredParameter" }
 
-    override Location getLocation() { destructured_parameter_def(this, _, _, result) }
+    override Location getLocation() { destructured_parameter_def(this, result) }
 
     AstNode getChild(int i) { destructured_parameter_child(this, i, result) }
 
-    override AstNode getParent() { destructured_parameter_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { destructured_parameter_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { destructured_parameter_child(this, _, result) }
   }
@@ -481,13 +479,13 @@ module Generated {
   class Do extends @do, AstNode {
     override string getAPrimaryQlClass() { result = "Do" }
 
-    override Location getLocation() { do_def(this, _, _, result) }
+    override Location getLocation() { do_def(this, result) }
 
     AstNode getChild(int i) { do_child(this, i, result) }
 
-    override AstNode getParent() { do_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { do_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { do_child(this, _, result) }
   }
@@ -495,15 +493,15 @@ module Generated {
   class DoBlock extends @do_block, AstNode {
     override string getAPrimaryQlClass() { result = "DoBlock" }
 
-    override Location getLocation() { do_block_def(this, _, _, result) }
+    override Location getLocation() { do_block_def(this, result) }
 
     BlockParameters getParameters() { do_block_parameters(this, result) }
 
     AstNode getChild(int i) { do_block_child(this, i, result) }
 
-    override AstNode getParent() { do_block_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { do_block_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       do_block_parameters(this, result) or do_block_child(this, _, result)
@@ -513,31 +511,31 @@ module Generated {
   class ElementReference extends @element_reference, AstNode {
     override string getAPrimaryQlClass() { result = "ElementReference" }
 
-    override Location getLocation() { element_reference_def(this, _, _, _, result) }
+    override Location getLocation() { element_reference_def(this, _, result) }
 
-    UnderscorePrimary getObject() { element_reference_def(this, _, _, result, _) }
+    UnderscorePrimary getObject() { element_reference_def(this, result, _) }
 
     AstNode getChild(int i) { element_reference_child(this, i, result) }
 
-    override AstNode getParent() { element_reference_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { element_reference_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      element_reference_def(this, _, _, result, _) or element_reference_child(this, _, result)
+      element_reference_def(this, result, _) or element_reference_child(this, _, result)
     }
   }
 
   class Else extends @else, AstNode {
     override string getAPrimaryQlClass() { result = "Else" }
 
-    override Location getLocation() { else_def(this, _, _, result) }
+    override Location getLocation() { else_def(this, result) }
 
     AstNode getChild(int i) { else_child(this, i, result) }
 
-    override AstNode getParent() { else_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { else_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { else_child(this, _, result) }
   }
@@ -545,21 +543,21 @@ module Generated {
   class Elsif extends @elsif, AstNode {
     override string getAPrimaryQlClass() { result = "Elsif" }
 
-    override Location getLocation() { elsif_def(this, _, _, _, result) }
+    override Location getLocation() { elsif_def(this, _, result) }
 
     AstNode getAlternative() { elsif_alternative(this, result) }
 
-    UnderscoreStatement getCondition() { elsif_def(this, _, _, result, _) }
+    UnderscoreStatement getCondition() { elsif_def(this, result, _) }
 
     Then getConsequence() { elsif_consequence(this, result) }
 
-    override AstNode getParent() { elsif_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { elsif_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       elsif_alternative(this, result) or
-      elsif_def(this, _, _, result, _) or
+      elsif_def(this, result, _) or
       elsif_consequence(this, result)
     }
   }
@@ -571,13 +569,13 @@ module Generated {
   class EndBlock extends @end_block, AstNode {
     override string getAPrimaryQlClass() { result = "EndBlock" }
 
-    override Location getLocation() { end_block_def(this, _, _, result) }
+    override Location getLocation() { end_block_def(this, result) }
 
     AstNode getChild(int i) { end_block_child(this, i, result) }
 
-    override AstNode getParent() { end_block_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { end_block_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { end_block_child(this, _, result) }
   }
@@ -585,13 +583,13 @@ module Generated {
   class Ensure extends @ensure, AstNode {
     override string getAPrimaryQlClass() { result = "Ensure" }
 
-    override Location getLocation() { ensure_def(this, _, _, result) }
+    override Location getLocation() { ensure_def(this, result) }
 
     AstNode getChild(int i) { ensure_child(this, i, result) }
 
-    override AstNode getParent() { ensure_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { ensure_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { ensure_child(this, _, result) }
   }
@@ -603,27 +601,27 @@ module Generated {
   class ExceptionVariable extends @exception_variable, AstNode {
     override string getAPrimaryQlClass() { result = "ExceptionVariable" }
 
-    override Location getLocation() { exception_variable_def(this, _, _, _, result) }
+    override Location getLocation() { exception_variable_def(this, _, result) }
 
-    UnderscoreLhs getChild() { exception_variable_def(this, _, _, result, _) }
+    UnderscoreLhs getChild() { exception_variable_def(this, result, _) }
 
-    override AstNode getParent() { exception_variable_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { exception_variable_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { exception_variable_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { exception_variable_def(this, result, _) }
   }
 
   class Exceptions extends @exceptions, AstNode {
     override string getAPrimaryQlClass() { result = "Exceptions" }
 
-    override Location getLocation() { exceptions_def(this, _, _, result) }
+    override Location getLocation() { exceptions_def(this, result) }
 
     AstNode getChild(int i) { exceptions_child(this, i, result) }
 
-    override AstNode getParent() { exceptions_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { exceptions_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { exceptions_child(this, _, result) }
   }
@@ -639,22 +637,22 @@ module Generated {
   class For extends @for, AstNode {
     override string getAPrimaryQlClass() { result = "For" }
 
-    override Location getLocation() { for_def(this, _, _, _, _, _, result) }
+    override Location getLocation() { for_def(this, _, _, _, result) }
 
-    Do getBody() { for_def(this, _, _, result, _, _, _) }
+    Do getBody() { for_def(this, result, _, _, _) }
 
-    AstNode getPattern() { for_def(this, _, _, _, result, _, _) }
+    AstNode getPattern() { for_def(this, _, result, _, _) }
 
-    In getValue() { for_def(this, _, _, _, _, result, _) }
+    In getValue() { for_def(this, _, _, result, _) }
 
-    override AstNode getParent() { for_def(this, result, _, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { for_def(this, _, result, _, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      for_def(this, _, _, result, _, _, _) or
-      for_def(this, _, _, _, result, _, _) or
-      for_def(this, _, _, _, _, result, _)
+      for_def(this, result, _, _, _) or
+      for_def(this, _, result, _, _) or
+      for_def(this, _, _, result, _)
     }
   }
 
@@ -665,13 +663,13 @@ module Generated {
   class Hash extends @hash, AstNode {
     override string getAPrimaryQlClass() { result = "Hash" }
 
-    override Location getLocation() { hash_def(this, _, _, result) }
+    override Location getLocation() { hash_def(this, result) }
 
     AstNode getChild(int i) { hash_child(this, i, result) }
 
-    override AstNode getParent() { hash_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { hash_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { hash_child(this, _, result) }
   }
@@ -683,27 +681,27 @@ module Generated {
   class HashSplatArgument extends @hash_splat_argument, AstNode {
     override string getAPrimaryQlClass() { result = "HashSplatArgument" }
 
-    override Location getLocation() { hash_splat_argument_def(this, _, _, _, result) }
+    override Location getLocation() { hash_splat_argument_def(this, _, result) }
 
-    UnderscoreArg getChild() { hash_splat_argument_def(this, _, _, result, _) }
+    UnderscoreArg getChild() { hash_splat_argument_def(this, result, _) }
 
-    override AstNode getParent() { hash_splat_argument_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { hash_splat_argument_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { hash_splat_argument_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { hash_splat_argument_def(this, result, _) }
   }
 
   class HashSplatParameter extends @hash_splat_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "HashSplatParameter" }
 
-    override Location getLocation() { hash_splat_parameter_def(this, _, _, result) }
+    override Location getLocation() { hash_splat_parameter_def(this, result) }
 
     Identifier getName() { hash_splat_parameter_name(this, result) }
 
-    override AstNode getParent() { hash_splat_parameter_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { hash_splat_parameter_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { hash_splat_parameter_name(this, result) }
   }
@@ -715,13 +713,13 @@ module Generated {
   class HeredocBody extends @heredoc_body, AstNode {
     override string getAPrimaryQlClass() { result = "HeredocBody" }
 
-    override Location getLocation() { heredoc_body_def(this, _, _, result) }
+    override Location getLocation() { heredoc_body_def(this, result) }
 
     AstNode getChild(int i) { heredoc_body_child(this, i, result) }
 
-    override AstNode getParent() { heredoc_body_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { heredoc_body_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { heredoc_body_child(this, _, result) }
   }
@@ -741,53 +739,53 @@ module Generated {
   class If extends @if, AstNode {
     override string getAPrimaryQlClass() { result = "If" }
 
-    override Location getLocation() { if_def(this, _, _, _, result) }
+    override Location getLocation() { if_def(this, _, result) }
 
     AstNode getAlternative() { if_alternative(this, result) }
 
-    UnderscoreStatement getCondition() { if_def(this, _, _, result, _) }
+    UnderscoreStatement getCondition() { if_def(this, result, _) }
 
     Then getConsequence() { if_consequence(this, result) }
 
-    override AstNode getParent() { if_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { if_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      if_alternative(this, result) or if_def(this, _, _, result, _) or if_consequence(this, result)
+      if_alternative(this, result) or if_def(this, result, _) or if_consequence(this, result)
     }
   }
 
   class IfModifier extends @if_modifier, AstNode {
     override string getAPrimaryQlClass() { result = "IfModifier" }
 
-    override Location getLocation() { if_modifier_def(this, _, _, _, _, result) }
+    override Location getLocation() { if_modifier_def(this, _, _, result) }
 
-    UnderscoreStatement getBody() { if_modifier_def(this, _, _, result, _, _) }
+    UnderscoreStatement getBody() { if_modifier_def(this, result, _, _) }
 
-    AstNode getCondition() { if_modifier_def(this, _, _, _, result, _) }
+    AstNode getCondition() { if_modifier_def(this, _, result, _) }
 
-    override AstNode getParent() { if_modifier_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { if_modifier_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      if_modifier_def(this, _, _, result, _, _) or if_modifier_def(this, _, _, _, result, _)
+      if_modifier_def(this, result, _, _) or if_modifier_def(this, _, result, _)
     }
   }
 
   class In extends @in, AstNode {
     override string getAPrimaryQlClass() { result = "In" }
 
-    override Location getLocation() { in_def(this, _, _, _, result) }
+    override Location getLocation() { in_def(this, _, result) }
 
-    UnderscoreArg getChild() { in_def(this, _, _, result, _) }
+    UnderscoreArg getChild() { in_def(this, result, _) }
 
-    override AstNode getParent() { in_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { in_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { in_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { in_def(this, result, _) }
   }
 
   class InstanceVariable extends @token_instance_variable, Token {
@@ -801,13 +799,13 @@ module Generated {
   class Interpolation extends @interpolation, AstNode {
     override string getAPrimaryQlClass() { result = "Interpolation" }
 
-    override Location getLocation() { interpolation_def(this, _, _, result) }
+    override Location getLocation() { interpolation_def(this, result) }
 
     AstNode getChild(int i) { interpolation_child(this, i, result) }
 
-    override AstNode getParent() { interpolation_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { interpolation_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { interpolation_child(this, _, result) }
   }
@@ -815,49 +813,49 @@ module Generated {
   class KeywordParameter extends @keyword_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "KeywordParameter" }
 
-    override Location getLocation() { keyword_parameter_def(this, _, _, _, result) }
+    override Location getLocation() { keyword_parameter_def(this, _, result) }
 
-    Identifier getName() { keyword_parameter_def(this, _, _, result, _) }
+    Identifier getName() { keyword_parameter_def(this, result, _) }
 
     UnderscoreArg getValue() { keyword_parameter_value(this, result) }
 
-    override AstNode getParent() { keyword_parameter_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { keyword_parameter_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      keyword_parameter_def(this, _, _, result, _) or keyword_parameter_value(this, result)
+      keyword_parameter_def(this, result, _) or keyword_parameter_value(this, result)
     }
   }
 
   class Lambda extends @lambda, AstNode {
     override string getAPrimaryQlClass() { result = "Lambda" }
 
-    override Location getLocation() { lambda_def(this, _, _, _, result) }
+    override Location getLocation() { lambda_def(this, _, result) }
 
-    AstNode getBody() { lambda_def(this, _, _, result, _) }
+    AstNode getBody() { lambda_def(this, result, _) }
 
     LambdaParameters getParameters() { lambda_parameters(this, result) }
 
-    override AstNode getParent() { lambda_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { lambda_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      lambda_def(this, _, _, result, _) or lambda_parameters(this, result)
+      lambda_def(this, result, _) or lambda_parameters(this, result)
     }
   }
 
   class LambdaParameters extends @lambda_parameters, AstNode {
     override string getAPrimaryQlClass() { result = "LambdaParameters" }
 
-    override Location getLocation() { lambda_parameters_def(this, _, _, result) }
+    override Location getLocation() { lambda_parameters_def(this, result) }
 
     AstNode getChild(int i) { lambda_parameters_child(this, i, result) }
 
-    override AstNode getParent() { lambda_parameters_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { lambda_parameters_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { lambda_parameters_child(this, _, result) }
   }
@@ -865,13 +863,13 @@ module Generated {
   class LeftAssignmentList extends @left_assignment_list, AstNode {
     override string getAPrimaryQlClass() { result = "LeftAssignmentList" }
 
-    override Location getLocation() { left_assignment_list_def(this, _, _, result) }
+    override Location getLocation() { left_assignment_list_def(this, result) }
 
     AstNode getChild(int i) { left_assignment_list_child(this, i, result) }
 
-    override AstNode getParent() { left_assignment_list_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { left_assignment_list_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { left_assignment_list_child(this, _, result) }
   }
@@ -879,20 +877,20 @@ module Generated {
   class Method extends @method, AstNode {
     override string getAPrimaryQlClass() { result = "Method" }
 
-    override Location getLocation() { method_def(this, _, _, _, result) }
+    override Location getLocation() { method_def(this, _, result) }
 
-    UnderscoreMethodName getName() { method_def(this, _, _, result, _) }
+    UnderscoreMethodName getName() { method_def(this, result, _) }
 
     MethodParameters getParameters() { method_parameters(this, result) }
 
     AstNode getChild(int i) { method_child(this, i, result) }
 
-    override AstNode getParent() { method_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { method_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      method_def(this, _, _, result, _) or
+      method_def(this, result, _) or
       method_parameters(this, result) or
       method_child(this, _, result)
     }
@@ -901,13 +899,13 @@ module Generated {
   class MethodParameters extends @method_parameters, AstNode {
     override string getAPrimaryQlClass() { result = "MethodParameters" }
 
-    override Location getLocation() { method_parameters_def(this, _, _, result) }
+    override Location getLocation() { method_parameters_def(this, result) }
 
     AstNode getChild(int i) { method_parameters_child(this, i, result) }
 
-    override AstNode getParent() { method_parameters_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { method_parameters_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { method_parameters_child(this, _, result) }
   }
@@ -915,31 +913,31 @@ module Generated {
   class Module extends @module, AstNode {
     override string getAPrimaryQlClass() { result = "Module" }
 
-    override Location getLocation() { module_def(this, _, _, _, result) }
+    override Location getLocation() { module_def(this, _, result) }
 
-    AstNode getName() { module_def(this, _, _, result, _) }
+    AstNode getName() { module_def(this, result, _) }
 
     AstNode getChild(int i) { module_child(this, i, result) }
 
-    override AstNode getParent() { module_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { module_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      module_def(this, _, _, result, _) or module_child(this, _, result)
+      module_def(this, result, _) or module_child(this, _, result)
     }
   }
 
   class Next extends @next, AstNode {
     override string getAPrimaryQlClass() { result = "Next" }
 
-    override Location getLocation() { next_def(this, _, _, result) }
+    override Location getLocation() { next_def(this, result) }
 
     ArgumentList getChild() { next_child(this, result) }
 
-    override AstNode getParent() { next_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { next_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { next_child(this, result) }
   }
@@ -955,12 +953,12 @@ module Generated {
   class OperatorAssignment extends @operator_assignment, AstNode {
     override string getAPrimaryQlClass() { result = "OperatorAssignment" }
 
-    override Location getLocation() { operator_assignment_def(this, _, _, _, _, _, result) }
+    override Location getLocation() { operator_assignment_def(this, _, _, _, result) }
 
-    UnderscoreLhs getLeft() { operator_assignment_def(this, _, _, result, _, _, _) }
+    UnderscoreLhs getLeft() { operator_assignment_def(this, result, _, _, _) }
 
     string getOperator() {
-      exists(int value | operator_assignment_def(this, _, _, _, value, _, _) |
+      exists(int value | operator_assignment_def(this, _, value, _, _) |
         result = "%=" and value = 0
         or
         result = "&&=" and value = 1
@@ -989,65 +987,64 @@ module Generated {
       )
     }
 
-    AstNode getRight() { operator_assignment_def(this, _, _, _, _, result, _) }
+    AstNode getRight() { operator_assignment_def(this, _, _, result, _) }
 
-    override AstNode getParent() { operator_assignment_def(this, result, _, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { operator_assignment_def(this, _, result, _, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      operator_assignment_def(this, _, _, result, _, _, _) or
-      operator_assignment_def(this, _, _, _, _, result, _)
+      operator_assignment_def(this, result, _, _, _) or
+      operator_assignment_def(this, _, _, result, _)
     }
   }
 
   class OptionalParameter extends @optional_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "OptionalParameter" }
 
-    override Location getLocation() { optional_parameter_def(this, _, _, _, _, result) }
+    override Location getLocation() { optional_parameter_def(this, _, _, result) }
 
-    Identifier getName() { optional_parameter_def(this, _, _, result, _, _) }
+    Identifier getName() { optional_parameter_def(this, result, _, _) }
 
-    UnderscoreArg getValue() { optional_parameter_def(this, _, _, _, result, _) }
+    UnderscoreArg getValue() { optional_parameter_def(this, _, result, _) }
 
-    override AstNode getParent() { optional_parameter_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { optional_parameter_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      optional_parameter_def(this, _, _, result, _, _) or
-      optional_parameter_def(this, _, _, _, result, _)
+      optional_parameter_def(this, result, _, _) or optional_parameter_def(this, _, result, _)
     }
   }
 
   class Pair extends @pair, AstNode {
     override string getAPrimaryQlClass() { result = "Pair" }
 
-    override Location getLocation() { pair_def(this, _, _, _, _, result) }
+    override Location getLocation() { pair_def(this, _, _, result) }
 
-    AstNode getKey() { pair_def(this, _, _, result, _, _) }
+    AstNode getKey() { pair_def(this, result, _, _) }
 
-    UnderscoreArg getValue() { pair_def(this, _, _, _, result, _) }
+    UnderscoreArg getValue() { pair_def(this, _, result, _) }
 
-    override AstNode getParent() { pair_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { pair_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      pair_def(this, _, _, result, _, _) or pair_def(this, _, _, _, result, _)
+      pair_def(this, result, _, _) or pair_def(this, _, result, _)
     }
   }
 
   class ParenthesizedStatements extends @parenthesized_statements, AstNode {
     override string getAPrimaryQlClass() { result = "ParenthesizedStatements" }
 
-    override Location getLocation() { parenthesized_statements_def(this, _, _, result) }
+    override Location getLocation() { parenthesized_statements_def(this, result) }
 
     AstNode getChild(int i) { parenthesized_statements_child(this, i, result) }
 
-    override AstNode getParent() { parenthesized_statements_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { parenthesized_statements_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { parenthesized_statements_child(this, _, result) }
   }
@@ -1055,27 +1052,27 @@ module Generated {
   class Pattern extends @pattern, AstNode {
     override string getAPrimaryQlClass() { result = "Pattern" }
 
-    override Location getLocation() { pattern_def(this, _, _, _, result) }
+    override Location getLocation() { pattern_def(this, _, result) }
 
-    AstNode getChild() { pattern_def(this, _, _, result, _) }
+    AstNode getChild() { pattern_def(this, result, _) }
 
-    override AstNode getParent() { pattern_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { pattern_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { pattern_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { pattern_def(this, result, _) }
   }
 
   class Program extends @program, AstNode {
     override string getAPrimaryQlClass() { result = "Program" }
 
-    override Location getLocation() { program_def(this, _, _, result) }
+    override Location getLocation() { program_def(this, result) }
 
     AstNode getChild(int i) { program_child(this, i, result) }
 
-    override AstNode getParent() { program_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { program_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { program_child(this, _, result) }
   }
@@ -1083,23 +1080,23 @@ module Generated {
   class Range extends @range, AstNode {
     override string getAPrimaryQlClass() { result = "Range" }
 
-    override Location getLocation() { range_def(this, _, _, _, result) }
+    override Location getLocation() { range_def(this, _, result) }
 
     UnderscoreArg getBegin() { range_begin(this, result) }
 
     UnderscoreArg getEnd() { range_end(this, result) }
 
     string getOperator() {
-      exists(int value | range_def(this, _, _, value, _) |
+      exists(int value | range_def(this, value, _) |
         result = ".." and value = 0
         or
         result = "..." and value = 1
       )
     }
 
-    override AstNode getParent() { range_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { range_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { range_begin(this, result) or range_end(this, result) }
   }
@@ -1107,27 +1104,27 @@ module Generated {
   class Rational extends @rational, AstNode {
     override string getAPrimaryQlClass() { result = "Rational" }
 
-    override Location getLocation() { rational_def(this, _, _, _, result) }
+    override Location getLocation() { rational_def(this, _, result) }
 
-    AstNode getChild() { rational_def(this, _, _, result, _) }
+    AstNode getChild() { rational_def(this, result, _) }
 
-    override AstNode getParent() { rational_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { rational_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { rational_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { rational_def(this, result, _) }
   }
 
   class Redo extends @redo, AstNode {
     override string getAPrimaryQlClass() { result = "Redo" }
 
-    override Location getLocation() { redo_def(this, _, _, result) }
+    override Location getLocation() { redo_def(this, result) }
 
     ArgumentList getChild() { redo_child(this, result) }
 
-    override AstNode getParent() { redo_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { redo_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { redo_child(this, result) }
   }
@@ -1135,13 +1132,13 @@ module Generated {
   class Regex extends @regex, AstNode {
     override string getAPrimaryQlClass() { result = "Regex" }
 
-    override Location getLocation() { regex_def(this, _, _, result) }
+    override Location getLocation() { regex_def(this, result) }
 
     AstNode getChild(int i) { regex_child(this, i, result) }
 
-    override AstNode getParent() { regex_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { regex_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { regex_child(this, _, result) }
   }
@@ -1149,7 +1146,7 @@ module Generated {
   class Rescue extends @rescue, AstNode {
     override string getAPrimaryQlClass() { result = "Rescue" }
 
-    override Location getLocation() { rescue_def(this, _, _, result) }
+    override Location getLocation() { rescue_def(this, result) }
 
     Then getBody() { rescue_body(this, result) }
 
@@ -1157,9 +1154,9 @@ module Generated {
 
     ExceptionVariable getVariable() { rescue_variable(this, result) }
 
-    override AstNode getParent() { rescue_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { rescue_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       rescue_body(this, result) or rescue_exceptions(this, result) or rescue_variable(this, result)
@@ -1169,31 +1166,31 @@ module Generated {
   class RescueModifier extends @rescue_modifier, AstNode {
     override string getAPrimaryQlClass() { result = "RescueModifier" }
 
-    override Location getLocation() { rescue_modifier_def(this, _, _, _, _, result) }
+    override Location getLocation() { rescue_modifier_def(this, _, _, result) }
 
-    UnderscoreStatement getBody() { rescue_modifier_def(this, _, _, result, _, _) }
+    UnderscoreStatement getBody() { rescue_modifier_def(this, result, _, _) }
 
-    AstNode getHandler() { rescue_modifier_def(this, _, _, _, result, _) }
+    AstNode getHandler() { rescue_modifier_def(this, _, result, _) }
 
-    override AstNode getParent() { rescue_modifier_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { rescue_modifier_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      rescue_modifier_def(this, _, _, result, _, _) or rescue_modifier_def(this, _, _, _, result, _)
+      rescue_modifier_def(this, result, _, _) or rescue_modifier_def(this, _, result, _)
     }
   }
 
   class RestAssignment extends @rest_assignment, AstNode {
     override string getAPrimaryQlClass() { result = "RestAssignment" }
 
-    override Location getLocation() { rest_assignment_def(this, _, _, result) }
+    override Location getLocation() { rest_assignment_def(this, result) }
 
     UnderscoreLhs getChild() { rest_assignment_child(this, result) }
 
-    override AstNode getParent() { rest_assignment_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { rest_assignment_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { rest_assignment_child(this, result) }
   }
@@ -1201,13 +1198,13 @@ module Generated {
   class Retry extends @retry, AstNode {
     override string getAPrimaryQlClass() { result = "Retry" }
 
-    override Location getLocation() { retry_def(this, _, _, result) }
+    override Location getLocation() { retry_def(this, result) }
 
     ArgumentList getChild() { retry_child(this, result) }
 
-    override AstNode getParent() { retry_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { retry_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { retry_child(this, result) }
   }
@@ -1215,13 +1212,13 @@ module Generated {
   class Return extends @return, AstNode {
     override string getAPrimaryQlClass() { result = "Return" }
 
-    override Location getLocation() { return_def(this, _, _, result) }
+    override Location getLocation() { return_def(this, result) }
 
     ArgumentList getChild() { return_child(this, result) }
 
-    override AstNode getParent() { return_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { return_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { return_child(this, result) }
   }
@@ -1229,13 +1226,13 @@ module Generated {
   class RightAssignmentList extends @right_assignment_list, AstNode {
     override string getAPrimaryQlClass() { result = "RightAssignmentList" }
 
-    override Location getLocation() { right_assignment_list_def(this, _, _, result) }
+    override Location getLocation() { right_assignment_list_def(this, result) }
 
     AstNode getChild(int i) { right_assignment_list_child(this, i, result) }
 
-    override AstNode getParent() { right_assignment_list_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { right_assignment_list_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { right_assignment_list_child(this, _, result) }
   }
@@ -1243,18 +1240,18 @@ module Generated {
   class ScopeResolution extends @scope_resolution, AstNode {
     override string getAPrimaryQlClass() { result = "ScopeResolution" }
 
-    override Location getLocation() { scope_resolution_def(this, _, _, _, result) }
+    override Location getLocation() { scope_resolution_def(this, _, result) }
 
-    AstNode getName() { scope_resolution_def(this, _, _, result, _) }
+    AstNode getName() { scope_resolution_def(this, result, _) }
 
     UnderscorePrimary getScope() { scope_resolution_scope(this, result) }
 
-    override AstNode getParent() { scope_resolution_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { scope_resolution_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      scope_resolution_def(this, _, _, result, _) or scope_resolution_scope(this, result)
+      scope_resolution_def(this, result, _) or scope_resolution_scope(this, result)
     }
   }
 
@@ -1265,15 +1262,15 @@ module Generated {
   class Setter extends @setter, AstNode {
     override string getAPrimaryQlClass() { result = "Setter" }
 
-    override Location getLocation() { setter_def(this, _, _, _, result) }
+    override Location getLocation() { setter_def(this, _, result) }
 
-    Identifier getName() { setter_def(this, _, _, result, _) }
+    Identifier getName() { setter_def(this, result, _) }
 
-    override AstNode getParent() { setter_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { setter_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { setter_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { setter_def(this, result, _) }
   }
 
   class SimpleSymbol extends @token_simple_symbol, Token {
@@ -1283,41 +1280,41 @@ module Generated {
   class SingletonClass extends @singleton_class, AstNode {
     override string getAPrimaryQlClass() { result = "SingletonClass" }
 
-    override Location getLocation() { singleton_class_def(this, _, _, _, result) }
+    override Location getLocation() { singleton_class_def(this, _, result) }
 
-    UnderscoreArg getValue() { singleton_class_def(this, _, _, result, _) }
+    UnderscoreArg getValue() { singleton_class_def(this, result, _) }
 
     AstNode getChild(int i) { singleton_class_child(this, i, result) }
 
-    override AstNode getParent() { singleton_class_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { singleton_class_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      singleton_class_def(this, _, _, result, _) or singleton_class_child(this, _, result)
+      singleton_class_def(this, result, _) or singleton_class_child(this, _, result)
     }
   }
 
   class SingletonMethod extends @singleton_method, AstNode {
     override string getAPrimaryQlClass() { result = "SingletonMethod" }
 
-    override Location getLocation() { singleton_method_def(this, _, _, _, _, result) }
+    override Location getLocation() { singleton_method_def(this, _, _, result) }
 
-    UnderscoreMethodName getName() { singleton_method_def(this, _, _, result, _, _) }
+    UnderscoreMethodName getName() { singleton_method_def(this, result, _, _) }
 
-    AstNode getObject() { singleton_method_def(this, _, _, _, result, _) }
+    AstNode getObject() { singleton_method_def(this, _, result, _) }
 
     MethodParameters getParameters() { singleton_method_parameters(this, result) }
 
     AstNode getChild(int i) { singleton_method_child(this, i, result) }
 
-    override AstNode getParent() { singleton_method_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { singleton_method_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      singleton_method_def(this, _, _, result, _, _) or
-      singleton_method_def(this, _, _, _, result, _) or
+      singleton_method_def(this, result, _, _) or
+      singleton_method_def(this, _, result, _) or
       singleton_method_parameters(this, result) or
       singleton_method_child(this, _, result)
     }
@@ -1326,27 +1323,27 @@ module Generated {
   class SplatArgument extends @splat_argument, AstNode {
     override string getAPrimaryQlClass() { result = "SplatArgument" }
 
-    override Location getLocation() { splat_argument_def(this, _, _, _, result) }
+    override Location getLocation() { splat_argument_def(this, _, result) }
 
-    UnderscoreArg getChild() { splat_argument_def(this, _, _, result, _) }
+    UnderscoreArg getChild() { splat_argument_def(this, result, _) }
 
-    override AstNode getParent() { splat_argument_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { splat_argument_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { splat_argument_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { splat_argument_def(this, result, _) }
   }
 
   class SplatParameter extends @splat_parameter, AstNode {
     override string getAPrimaryQlClass() { result = "SplatParameter" }
 
-    override Location getLocation() { splat_parameter_def(this, _, _, result) }
+    override Location getLocation() { splat_parameter_def(this, result) }
 
     Identifier getName() { splat_parameter_name(this, result) }
 
-    override AstNode getParent() { splat_parameter_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { splat_parameter_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { splat_parameter_name(this, result) }
   }
@@ -1354,13 +1351,13 @@ module Generated {
   class String extends @string__, AstNode {
     override string getAPrimaryQlClass() { result = "String" }
 
-    override Location getLocation() { string_def(this, _, _, result) }
+    override Location getLocation() { string_def(this, result) }
 
     AstNode getChild(int i) { string_child(this, i, result) }
 
-    override AstNode getParent() { string_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { string_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { string_child(this, _, result) }
   }
@@ -1368,13 +1365,13 @@ module Generated {
   class StringArray extends @string_array, AstNode {
     override string getAPrimaryQlClass() { result = "StringArray" }
 
-    override Location getLocation() { string_array_def(this, _, _, result) }
+    override Location getLocation() { string_array_def(this, result) }
 
     BareString getChild(int i) { string_array_child(this, i, result) }
 
-    override AstNode getParent() { string_array_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { string_array_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { string_array_child(this, _, result) }
   }
@@ -1386,13 +1383,13 @@ module Generated {
   class Subshell extends @subshell, AstNode {
     override string getAPrimaryQlClass() { result = "Subshell" }
 
-    override Location getLocation() { subshell_def(this, _, _, result) }
+    override Location getLocation() { subshell_def(this, result) }
 
     AstNode getChild(int i) { subshell_child(this, i, result) }
 
-    override AstNode getParent() { subshell_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { subshell_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { subshell_child(this, _, result) }
   }
@@ -1404,27 +1401,27 @@ module Generated {
   class Superclass extends @superclass, AstNode {
     override string getAPrimaryQlClass() { result = "Superclass" }
 
-    override Location getLocation() { superclass_def(this, _, _, _, result) }
+    override Location getLocation() { superclass_def(this, _, result) }
 
-    AstNode getChild() { superclass_def(this, _, _, result, _) }
+    AstNode getChild() { superclass_def(this, result, _) }
 
-    override AstNode getParent() { superclass_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { superclass_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { superclass_def(this, _, _, result, _) }
+    override AstNode getAFieldOrChild() { superclass_def(this, result, _) }
   }
 
   class SymbolArray extends @symbol_array, AstNode {
     override string getAPrimaryQlClass() { result = "SymbolArray" }
 
-    override Location getLocation() { symbol_array_def(this, _, _, result) }
+    override Location getLocation() { symbol_array_def(this, result) }
 
     BareSymbol getChild(int i) { symbol_array_child(this, i, result) }
 
-    override AstNode getParent() { symbol_array_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { symbol_array_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { symbol_array_child(this, _, result) }
   }
@@ -1432,13 +1429,13 @@ module Generated {
   class Then extends @then, AstNode {
     override string getAPrimaryQlClass() { result = "Then" }
 
-    override Location getLocation() { then_def(this, _, _, result) }
+    override Location getLocation() { then_def(this, result) }
 
     AstNode getChild(int i) { then_child(this, i, result) }
 
-    override AstNode getParent() { then_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { then_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { then_child(this, _, result) }
   }
@@ -1450,12 +1447,12 @@ module Generated {
   class Unary extends @unary, AstNode {
     override string getAPrimaryQlClass() { result = "Unary" }
 
-    override Location getLocation() { unary_def(this, _, _, _, _, result) }
+    override Location getLocation() { unary_def(this, _, _, result) }
 
-    AstNode getOperand() { unary_def(this, _, _, result, _, _) }
+    AstNode getOperand() { unary_def(this, result, _, _) }
 
     string getOperator() {
-      exists(int value | unary_def(this, _, _, _, value, _) |
+      exists(int value | unary_def(this, _, value, _) |
         result = "!" and value = 0
         or
         result = "+" and value = 1
@@ -1470,23 +1467,23 @@ module Generated {
       )
     }
 
-    override AstNode getParent() { unary_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { unary_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
-    override AstNode getAFieldOrChild() { unary_def(this, _, _, result, _, _) }
+    override AstNode getAFieldOrChild() { unary_def(this, result, _, _) }
   }
 
   class Undef extends @undef, AstNode {
     override string getAPrimaryQlClass() { result = "Undef" }
 
-    override Location getLocation() { undef_def(this, _, _, result) }
+    override Location getLocation() { undef_def(this, result) }
 
     UnderscoreMethodName getChild(int i) { undef_child(this, i, result) }
 
-    override AstNode getParent() { undef_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { undef_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { undef_child(this, _, result) }
   }
@@ -1498,21 +1495,21 @@ module Generated {
   class Unless extends @unless, AstNode {
     override string getAPrimaryQlClass() { result = "Unless" }
 
-    override Location getLocation() { unless_def(this, _, _, _, result) }
+    override Location getLocation() { unless_def(this, _, result) }
 
     AstNode getAlternative() { unless_alternative(this, result) }
 
-    UnderscoreStatement getCondition() { unless_def(this, _, _, result, _) }
+    UnderscoreStatement getCondition() { unless_def(this, result, _) }
 
     Then getConsequence() { unless_consequence(this, result) }
 
-    override AstNode getParent() { unless_def(this, result, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { unless_def(this, _, result, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
       unless_alternative(this, result) or
-      unless_def(this, _, _, result, _) or
+      unless_def(this, result, _) or
       unless_consequence(this, result)
     }
   }
@@ -1520,69 +1517,69 @@ module Generated {
   class UnlessModifier extends @unless_modifier, AstNode {
     override string getAPrimaryQlClass() { result = "UnlessModifier" }
 
-    override Location getLocation() { unless_modifier_def(this, _, _, _, _, result) }
+    override Location getLocation() { unless_modifier_def(this, _, _, result) }
 
-    UnderscoreStatement getBody() { unless_modifier_def(this, _, _, result, _, _) }
+    UnderscoreStatement getBody() { unless_modifier_def(this, result, _, _) }
 
-    AstNode getCondition() { unless_modifier_def(this, _, _, _, result, _) }
+    AstNode getCondition() { unless_modifier_def(this, _, result, _) }
 
-    override AstNode getParent() { unless_modifier_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { unless_modifier_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      unless_modifier_def(this, _, _, result, _, _) or unless_modifier_def(this, _, _, _, result, _)
+      unless_modifier_def(this, result, _, _) or unless_modifier_def(this, _, result, _)
     }
   }
 
   class Until extends @until, AstNode {
     override string getAPrimaryQlClass() { result = "Until" }
 
-    override Location getLocation() { until_def(this, _, _, _, _, result) }
+    override Location getLocation() { until_def(this, _, _, result) }
 
-    Do getBody() { until_def(this, _, _, result, _, _) }
+    Do getBody() { until_def(this, result, _, _) }
 
-    UnderscoreStatement getCondition() { until_def(this, _, _, _, result, _) }
+    UnderscoreStatement getCondition() { until_def(this, _, result, _) }
 
-    override AstNode getParent() { until_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { until_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      until_def(this, _, _, result, _, _) or until_def(this, _, _, _, result, _)
+      until_def(this, result, _, _) or until_def(this, _, result, _)
     }
   }
 
   class UntilModifier extends @until_modifier, AstNode {
     override string getAPrimaryQlClass() { result = "UntilModifier" }
 
-    override Location getLocation() { until_modifier_def(this, _, _, _, _, result) }
+    override Location getLocation() { until_modifier_def(this, _, _, result) }
 
-    UnderscoreStatement getBody() { until_modifier_def(this, _, _, result, _, _) }
+    UnderscoreStatement getBody() { until_modifier_def(this, result, _, _) }
 
-    AstNode getCondition() { until_modifier_def(this, _, _, _, result, _) }
+    AstNode getCondition() { until_modifier_def(this, _, result, _) }
 
-    override AstNode getParent() { until_modifier_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { until_modifier_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      until_modifier_def(this, _, _, result, _, _) or until_modifier_def(this, _, _, _, result, _)
+      until_modifier_def(this, result, _, _) or until_modifier_def(this, _, result, _)
     }
   }
 
   class When extends @when, AstNode {
     override string getAPrimaryQlClass() { result = "When" }
 
-    override Location getLocation() { when_def(this, _, _, result) }
+    override Location getLocation() { when_def(this, result) }
 
     Then getBody() { when_body(this, result) }
 
     Pattern getPattern(int i) { when_pattern(this, i, result) }
 
-    override AstNode getParent() { when_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { when_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { when_body(this, result) or when_pattern(this, _, result) }
   }
@@ -1590,49 +1587,49 @@ module Generated {
   class While extends @while, AstNode {
     override string getAPrimaryQlClass() { result = "While" }
 
-    override Location getLocation() { while_def(this, _, _, _, _, result) }
+    override Location getLocation() { while_def(this, _, _, result) }
 
-    Do getBody() { while_def(this, _, _, result, _, _) }
+    Do getBody() { while_def(this, result, _, _) }
 
-    UnderscoreStatement getCondition() { while_def(this, _, _, _, result, _) }
+    UnderscoreStatement getCondition() { while_def(this, _, result, _) }
 
-    override AstNode getParent() { while_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { while_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      while_def(this, _, _, result, _, _) or while_def(this, _, _, _, result, _)
+      while_def(this, result, _, _) or while_def(this, _, result, _)
     }
   }
 
   class WhileModifier extends @while_modifier, AstNode {
     override string getAPrimaryQlClass() { result = "WhileModifier" }
 
-    override Location getLocation() { while_modifier_def(this, _, _, _, _, result) }
+    override Location getLocation() { while_modifier_def(this, _, _, result) }
 
-    UnderscoreStatement getBody() { while_modifier_def(this, _, _, result, _, _) }
+    UnderscoreStatement getBody() { while_modifier_def(this, result, _, _) }
 
-    AstNode getCondition() { while_modifier_def(this, _, _, _, result, _) }
+    AstNode getCondition() { while_modifier_def(this, _, result, _) }
 
-    override AstNode getParent() { while_modifier_def(this, result, _, _, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { while_modifier_def(this, _, result, _, _, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() {
-      while_modifier_def(this, _, _, result, _, _) or while_modifier_def(this, _, _, _, result, _)
+      while_modifier_def(this, result, _, _) or while_modifier_def(this, _, result, _)
     }
   }
 
   class Yield extends @yield, AstNode {
     override string getAPrimaryQlClass() { result = "Yield" }
 
-    override Location getLocation() { yield_def(this, _, _, result) }
+    override Location getLocation() { yield_def(this, result) }
 
     ArgumentList getChild() { yield_child(this, result) }
 
-    override AstNode getParent() { yield_def(this, result, _, _) }
+    override AstNode getParent() { ast_node_parent(this, result, _) }
 
-    override int getParentIndex() { yield_def(this, _, result, _) }
+    override int getParentIndex() { ast_node_parent(this, _, result) }
 
     override AstNode getAFieldOrChild() { yield_child(this, result) }
   }
diff --git a/ql/src/ruby.dbscheme b/ql/src/ruby.dbscheme
index 9f1ab8aabe2..8725deeb2fa 100644
--- a/ql/src/ruby.dbscheme
+++ b/ql/src/ruby.dbscheme
@@ -58,11 +58,8 @@ sourceLocationPrefix(
 
 @underscore_variable = @token_class_variable | @token_constant | @token_global_variable | @token_identifier | @token_instance_variable | @token_self | @token_super
 
-#keyset[parent, parent_index]
 alias_def(
   unique int id: @alias,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int alias: @underscore_method_name ref,
   int name: @underscore_method_name ref,
   int loc: @location ref
@@ -77,11 +74,8 @@ argument_list_child(
   unique int child: @argument_list_child_type ref
 );
 
-#keyset[parent, parent_index]
 argument_list_def(
   unique int id: @argument_list,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -94,11 +88,8 @@ array_child(
   unique int child: @array_child_type ref
 );
 
-#keyset[parent, parent_index]
 array_def(
   unique int id: @array,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -106,11 +97,8 @@ array_def(
 
 @assignment_right_type = @break | @call | @next | @return | @right_assignment_list | @splat_argument | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 assignment_def(
   unique int id: @assignment,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int left: @assignment_left_type ref,
   int right: @assignment_right_type ref,
   int loc: @location ref
@@ -125,11 +113,8 @@ bare_string_child(
   unique int child: @bare_string_child_type ref
 );
 
-#keyset[parent, parent_index]
 bare_string_def(
   unique int id: @bare_string,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -142,11 +127,8 @@ bare_symbol_child(
   unique int child: @bare_symbol_child_type ref
 );
 
-#keyset[parent, parent_index]
 bare_symbol_def(
   unique int id: @bare_symbol,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -159,11 +141,8 @@ begin_child(
   unique int child: @begin_child_type ref
 );
 
-#keyset[parent, parent_index]
 begin_def(
   unique int id: @begin,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -176,11 +155,8 @@ begin_block_child(
   unique int child: @begin_block_child_type ref
 );
 
-#keyset[parent, parent_index]
 begin_block_def(
   unique int id: @begin_block,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -217,11 +193,8 @@ case @binary.operator of
 
 @binary_right_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 binary_def(
   unique int id: @binary,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int left: @binary_left_type ref,
   int operator: int ref,
   int right: @binary_right_type ref,
@@ -242,28 +215,19 @@ block_child(
   unique int child: @block_child_type ref
 );
 
-#keyset[parent, parent_index]
 block_def(
   unique int id: @block,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 block_argument_def(
   unique int id: @block_argument,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 block_parameter_def(
   unique int id: @block_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @token_identifier ref,
   int loc: @location ref
 );
@@ -277,11 +241,8 @@ block_parameters_child(
   unique int child: @block_parameters_child_type ref
 );
 
-#keyset[parent, parent_index]
 block_parameters_def(
   unique int id: @block_parameters,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -290,11 +251,8 @@ break_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 break_def(
   unique int id: @break,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -319,11 +277,8 @@ call_receiver(
   unique int receiver: @call_receiver_type ref
 );
 
-#keyset[parent, parent_index]
 call_def(
   unique int id: @call,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int method: @call_method_type ref,
   int loc: @location ref
 );
@@ -342,11 +297,8 @@ case_child(
   unique int child: @case_child_type ref
 );
 
-#keyset[parent, parent_index]
 case_def(
   unique int id: @case__,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -357,11 +309,8 @@ chained_string_child(
   unique int child: @string__ ref
 );
 
-#keyset[parent, parent_index]
 chained_string_def(
   unique int id: @chained_string,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -381,20 +330,14 @@ class_child(
   unique int child: @class_child_type ref
 );
 
-#keyset[parent, parent_index]
 class_def(
   unique int id: @class,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @class_name_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 conditional_def(
   unique int id: @conditional,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int alternative: @underscore_arg ref,
   int condition: @underscore_arg ref,
   int consequence: @underscore_arg ref,
@@ -410,11 +353,8 @@ delimited_symbol_child(
   unique int child: @delimited_symbol_child_type ref
 );
 
-#keyset[parent, parent_index]
 delimited_symbol_def(
   unique int id: @delimited_symbol,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -427,11 +367,8 @@ destructured_left_assignment_child(
   unique int child: @destructured_left_assignment_child_type ref
 );
 
-#keyset[parent, parent_index]
 destructured_left_assignment_def(
   unique int id: @destructured_left_assignment,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -444,11 +381,8 @@ destructured_parameter_child(
   unique int child: @destructured_parameter_child_type ref
 );
 
-#keyset[parent, parent_index]
 destructured_parameter_def(
   unique int id: @destructured_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -461,11 +395,8 @@ do_child(
   unique int child: @do_child_type ref
 );
 
-#keyset[parent, parent_index]
 do_def(
   unique int id: @do,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -483,11 +414,8 @@ do_block_child(
   unique int child: @do_block_child_type ref
 );
 
-#keyset[parent, parent_index]
 do_block_def(
   unique int id: @do_block,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -500,11 +428,8 @@ element_reference_child(
   unique int child: @element_reference_child_type ref
 );
 
-#keyset[parent, parent_index]
 element_reference_def(
   unique int id: @element_reference,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int object: @underscore_primary ref,
   int loc: @location ref
 );
@@ -518,11 +443,8 @@ else_child(
   unique int child: @else_child_type ref
 );
 
-#keyset[parent, parent_index]
 else_def(
   unique int id: @else,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -538,11 +460,8 @@ elsif_consequence(
   unique int consequence: @then ref
 );
 
-#keyset[parent, parent_index]
 elsif_def(
   unique int id: @elsif,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
@@ -556,11 +475,8 @@ end_block_child(
   unique int child: @end_block_child_type ref
 );
 
-#keyset[parent, parent_index]
 end_block_def(
   unique int id: @end_block,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -573,19 +489,13 @@ ensure_child(
   unique int child: @ensure_child_type ref
 );
 
-#keyset[parent, parent_index]
 ensure_def(
   unique int id: @ensure,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 exception_variable_def(
   unique int id: @exception_variable,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @underscore_lhs ref,
   int loc: @location ref
 );
@@ -599,21 +509,15 @@ exceptions_child(
   unique int child: @exceptions_child_type ref
 );
 
-#keyset[parent, parent_index]
 exceptions_def(
   unique int id: @exceptions,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
 @for_pattern_type = @left_assignment_list | @underscore_lhs
 
-#keyset[parent, parent_index]
 for_def(
   unique int id: @for,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @do ref,
   int pattern: @for_pattern_type ref,
   int value: @in ref,
@@ -629,19 +533,13 @@ hash_child(
   unique int child: @hash_child_type ref
 );
 
-#keyset[parent, parent_index]
 hash_def(
   unique int id: @hash,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 hash_splat_argument_def(
   unique int id: @hash_splat_argument,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -651,11 +549,8 @@ hash_splat_parameter_name(
   unique int name: @token_identifier ref
 );
 
-#keyset[parent, parent_index]
 hash_splat_parameter_def(
   unique int id: @hash_splat_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -668,11 +563,8 @@ heredoc_body_child(
   unique int child: @heredoc_body_child_type ref
 );
 
-#keyset[parent, parent_index]
 heredoc_body_def(
   unique int id: @heredoc_body,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -688,32 +580,23 @@ if_consequence(
   unique int consequence: @then ref
 );
 
-#keyset[parent, parent_index]
 if_def(
   unique int id: @if,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
 
 @if_modifier_condition_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 if_modifier_def(
   unique int id: @if_modifier,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @if_modifier_condition_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 in_def(
   unique int id: @in,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -727,11 +610,8 @@ interpolation_child(
   unique int child: @interpolation_child_type ref
 );
 
-#keyset[parent, parent_index]
 interpolation_def(
   unique int id: @interpolation,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -740,11 +620,8 @@ keyword_parameter_value(
   unique int value: @underscore_arg ref
 );
 
-#keyset[parent, parent_index]
 keyword_parameter_def(
   unique int id: @keyword_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @token_identifier ref,
   int loc: @location ref
 );
@@ -756,11 +633,8 @@ lambda_parameters(
   unique int parameters: @lambda_parameters ref
 );
 
-#keyset[parent, parent_index]
 lambda_def(
   unique int id: @lambda,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @lambda_body_type ref,
   int loc: @location ref
 );
@@ -774,11 +648,8 @@ lambda_parameters_child(
   unique int child: @lambda_parameters_child_type ref
 );
 
-#keyset[parent, parent_index]
 lambda_parameters_def(
   unique int id: @lambda_parameters,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -791,11 +662,8 @@ left_assignment_list_child(
   unique int child: @left_assignment_list_child_type ref
 );
 
-#keyset[parent, parent_index]
 left_assignment_list_def(
   unique int id: @left_assignment_list,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -813,11 +681,8 @@ method_child(
   unique int child: @method_child_type ref
 );
 
-#keyset[parent, parent_index]
 method_def(
   unique int id: @method,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @underscore_method_name ref,
   int loc: @location ref
 );
@@ -831,11 +696,8 @@ method_parameters_child(
   unique int child: @method_parameters_child_type ref
 );
 
-#keyset[parent, parent_index]
 method_parameters_def(
   unique int id: @method_parameters,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -850,11 +712,8 @@ module_child(
   unique int child: @module_child_type ref
 );
 
-#keyset[parent, parent_index]
 module_def(
   unique int id: @module,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @module_name_type ref,
   int loc: @location ref
 );
@@ -864,11 +723,8 @@ next_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 next_def(
   unique int id: @next,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -891,22 +747,16 @@ case @operator_assignment.operator of
 
 @operator_assignment_right_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 operator_assignment_def(
   unique int id: @operator_assignment,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int left: @underscore_lhs ref,
   int operator: int ref,
   int right: @operator_assignment_right_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 optional_parameter_def(
   unique int id: @optional_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @token_identifier ref,
   int value: @underscore_arg ref,
   int loc: @location ref
@@ -914,11 +764,8 @@ optional_parameter_def(
 
 @pair_key_type = @string__ | @token_hash_key_symbol | @underscore_arg
 
-#keyset[parent, parent_index]
 pair_def(
   unique int id: @pair,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int key__: @pair_key_type ref,
   int value: @underscore_arg ref,
   int loc: @location ref
@@ -933,21 +780,15 @@ parenthesized_statements_child(
   unique int child: @parenthesized_statements_child_type ref
 );
 
-#keyset[parent, parent_index]
 parenthesized_statements_def(
   unique int id: @parenthesized_statements,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
 @pattern_child_type = @splat_argument | @underscore_arg
 
-#keyset[parent, parent_index]
 pattern_def(
   unique int id: @pattern,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @pattern_child_type ref,
   int loc: @location ref
 );
@@ -961,11 +802,8 @@ program_child(
   unique int child: @program_child_type ref
 );
 
-#keyset[parent, parent_index]
 program_def(
   unique int id: @program,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -985,22 +823,16 @@ case @range.operator of
 ;
 
 
-#keyset[parent, parent_index]
 range_def(
   unique int id: @range,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int operator: int ref,
   int loc: @location ref
 );
 
 @rational_child_type = @token_float | @token_integer
 
-#keyset[parent, parent_index]
 rational_def(
   unique int id: @rational,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @rational_child_type ref,
   int loc: @location ref
 );
@@ -1010,11 +842,8 @@ redo_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 redo_def(
   unique int id: @redo,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1027,11 +856,8 @@ regex_child(
   unique int child: @regex_child_type ref
 );
 
-#keyset[parent, parent_index]
 regex_def(
   unique int id: @regex,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1050,21 +876,15 @@ rescue_variable(
   unique int variable: @exception_variable ref
 );
 
-#keyset[parent, parent_index]
 rescue_def(
   unique int id: @rescue,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
 @rescue_modifier_handler_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 rescue_modifier_def(
   unique int id: @rescue_modifier,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @underscore_statement ref,
   int handler: @rescue_modifier_handler_type ref,
   int loc: @location ref
@@ -1075,11 +895,8 @@ rest_assignment_child(
   unique int child: @underscore_lhs ref
 );
 
-#keyset[parent, parent_index]
 rest_assignment_def(
   unique int id: @rest_assignment,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1088,11 +905,8 @@ retry_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 retry_def(
   unique int id: @retry,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1101,11 +915,8 @@ return_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 return_def(
   unique int id: @return,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1118,11 +929,8 @@ right_assignment_list_child(
   unique int child: @right_assignment_list_child_type ref
 );
 
-#keyset[parent, parent_index]
 right_assignment_list_def(
   unique int id: @right_assignment_list,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1133,20 +941,14 @@ scope_resolution_scope(
   unique int scope: @underscore_primary ref
 );
 
-#keyset[parent, parent_index]
 scope_resolution_def(
   unique int id: @scope_resolution,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @scope_resolution_name_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 setter_def(
   unique int id: @setter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @token_identifier ref,
   int loc: @location ref
 );
@@ -1160,11 +962,8 @@ singleton_class_child(
   unique int child: @singleton_class_child_type ref
 );
 
-#keyset[parent, parent_index]
 singleton_class_def(
   unique int id: @singleton_class,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int value: @underscore_arg ref,
   int loc: @location ref
 );
@@ -1185,21 +984,15 @@ singleton_method_child(
   unique int child: @singleton_method_child_type ref
 );
 
-#keyset[parent, parent_index]
 singleton_method_def(
   unique int id: @singleton_method,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int name: @underscore_method_name ref,
   int object: @singleton_method_object_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 splat_argument_def(
   unique int id: @splat_argument,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @underscore_arg ref,
   int loc: @location ref
 );
@@ -1209,11 +1002,8 @@ splat_parameter_name(
   unique int name: @token_identifier ref
 );
 
-#keyset[parent, parent_index]
 splat_parameter_def(
   unique int id: @splat_parameter,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1226,11 +1016,8 @@ string_child(
   unique int child: @string_child_type ref
 );
 
-#keyset[parent, parent_index]
 string_def(
   unique int id: @string__,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1241,11 +1028,8 @@ string_array_child(
   unique int child: @bare_string ref
 );
 
-#keyset[parent, parent_index]
 string_array_def(
   unique int id: @string_array,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1258,21 +1042,15 @@ subshell_child(
   unique int child: @subshell_child_type ref
 );
 
-#keyset[parent, parent_index]
 subshell_def(
   unique int id: @subshell,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
 @superclass_child_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 superclass_def(
   unique int id: @superclass,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int child: @superclass_child_type ref,
   int loc: @location ref
 );
@@ -1284,11 +1062,8 @@ symbol_array_child(
   unique int child: @bare_symbol ref
 );
 
-#keyset[parent, parent_index]
 symbol_array_def(
   unique int id: @symbol_array,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1301,11 +1076,8 @@ then_child(
   unique int child: @then_child_type ref
 );
 
-#keyset[parent, parent_index]
 then_def(
   unique int id: @then,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1321,11 +1093,8 @@ case @unary.operator of
 ;
 
 
-#keyset[parent, parent_index]
 unary_def(
   unique int id: @unary,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int operand: @unary_operand_type ref,
   int operator: int ref,
   int loc: @location ref
@@ -1338,11 +1107,8 @@ undef_child(
   unique int child: @underscore_method_name ref
 );
 
-#keyset[parent, parent_index]
 undef_def(
   unique int id: @undef,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
@@ -1358,32 +1124,23 @@ unless_consequence(
   unique int consequence: @then ref
 );
 
-#keyset[parent, parent_index]
 unless_def(
   unique int id: @unless,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
 );
 
 @unless_modifier_condition_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 unless_modifier_def(
   unique int id: @unless_modifier,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @unless_modifier_condition_type ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 until_def(
   unique int id: @until,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @do ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
@@ -1391,11 +1148,8 @@ until_def(
 
 @until_modifier_condition_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 until_modifier_def(
   unique int id: @until_modifier,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @until_modifier_condition_type ref,
   int loc: @location ref
@@ -1413,19 +1167,13 @@ when_pattern(
   unique int pattern: @pattern ref
 );
 
-#keyset[parent, parent_index]
 when_def(
   unique int id: @when,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 while_def(
   unique int id: @while,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @do ref,
   int condition: @underscore_statement ref,
   int loc: @location ref
@@ -1433,11 +1181,8 @@ while_def(
 
 @while_modifier_condition_type = @break | @call | @next | @return | @underscore_arg | @yield
 
-#keyset[parent, parent_index]
 while_modifier_def(
   unique int id: @while_modifier,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int body: @underscore_statement ref,
   int condition: @while_modifier_condition_type ref,
   int loc: @location ref
@@ -1448,19 +1193,13 @@ yield_child(
   unique int child: @argument_list ref
 );
 
-#keyset[parent, parent_index]
 yield_def(
   unique int id: @yield,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int loc: @location ref
 );
 
-#keyset[parent, parent_index]
 tokeninfo(
   unique int id: @token,
-  int parent: @ast_node_parent ref,
-  int parent_index: int ref,
   int kind: int ref,
   int file: @file ref,
   int idx: int ref,
@@ -1502,3 +1241,10 @@ case @token.kind of
 
 @ast_node_parent = @ast_node | @file
 
+#keyset[parent, parent_index]
+ast_node_parent(
+  int child: @ast_node ref,
+  int parent: @ast_node_parent ref,
+  int parent_index: int ref
+);
+