[ruby/prism] Change numbered parameters

Previously numbered parameters were a field on blocks and lambdas that indicated the maximum number of numbered parameters in either the block or lambda, respectively. However they also had a parameters field that would always be nil in these cases. This changes it so that we introduce a NumberedParametersNode that goes in place of parameters, which has a single uint8_t maximum field on it. That field contains the maximum numbered parameter in either the block or lambda. As a part of the PR, I'm introducing a new UInt8Field type that can be used on nodes, which is just to make it a little more explicit what the maximum values can be (the maximum is actually 9, since it only goes up to _9). Plus we can do a couple of nice things in serialization like just read a single byte. https://github.com/ruby/prism/commit/2d87303903
author: Kevin Newton <[email protected]> 2023-11-30 20:47:08 -0500
committer: Kevin Newton <[email protected]> 2023-12-01 12:03:09 -0500
commit: cdb74d74afb87a0d7048a53aaf12d32516033a3c (patch)
tree: b90ab9a755b94de8e55f5f72a6552f3ea4aed3b5
parent: 90d9c20a0c0df5565d5f95d5e14c58331fa5922f (diff)
205 files changed, 983 insertions, 1361 deletions
diff --git a/lib/prism/debug.rb b/lib/prism/debug.rb
index adbc402f32..e275fe1dff 100644
--- a/lib/prism/debug.rb
+++ b/lib/prism/debug.rb
@@ -103,9 +103,14 @@ module Prism
         case node
         when BlockNode, DefNode, LambdaNode
           names = node.locals
-
-          params = node.parameters
-          params = params&.parameters unless node.is_a?(DefNode)
+          params =
+            if node.is_a?(DefNode)
+              node.parameters
+            elsif node.parameters.is_a?(NumberedParametersNode)
+              nil
+            else
+              node.parameters&.parameters
+            end
 
           # prism places parameters in the same order that they appear in the
           # source. CRuby places them in the order that they need to appear
diff --git a/prism/config.yml b/prism/config.yml
index 4fd5c462f1..806fb25c9f 100644
--- a/prism/config.yml
+++ b/prism/config.yml
@@ -589,15 +589,12 @@ nodes:
         type: constant[]
       - name: parameters
         type: node?
-        kind: BlockParametersNode
       - name: body
         type: node?
       - name: opening_loc
         type: location
       - name: closing_loc
         type: location
-      - name: numbered_parameters
-        type: uint32
     comment: |
       Represents a block of ruby code.
 
@@ -1772,11 +1769,8 @@ nodes:
         type: location
       - name: parameters
         type: node?
-        kind: BlockParametersNode
       - name: body
         type: node?
-      - name: numbered_parameters
-        type: uint32
     comment: |
       Represents using a lambda literal (not the lambda method call).
 
@@ -2026,6 +2020,16 @@ nodes:
           def a(**nil)
                 ^^^^^
           end
+  - name: NumberedParametersNode
+    fields:
+      - name: maximum
+        type: uint8
+    comment: |
+      Represents an implicit set of parameters through the use of numbered
+      parameters within a block or lambda.
+
+          -> { _1 + _2 }
+          ^^^^^^^^^^^^^^
   - name: NumberedReferenceReadNode
     fields:
       - name: number
diff --git a/prism/parser.h b/prism/parser.h
index e4eb5a5f0c..237f9fead9 100644
--- a/prism/parser.h
+++ b/prism/parser.h
@@ -474,7 +474,7 @@ typedef struct pm_scope {
      * numbered parameters, and to pass information to consumers of the AST
      * about how many numbered parameters exist.
      */
-    uint32_t numbered_parameters;
+    uint8_t numbered_parameters;
 } pm_scope_t;
 
 /**
diff --git a/prism/prism.c b/prism/prism.c
index ea82745896..21dfd58c67 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -1467,7 +1467,7 @@ pm_block_argument_node_create(pm_parser_t *parser, const pm_token_t *operator, p
  * Allocate and initialize a new BlockNode node.
  */
 static pm_block_node_t *
-pm_block_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *opening, pm_block_parameters_node_t *parameters, pm_node_t *body, const pm_token_t *closing, uint32_t numbered_parameters) {
+pm_block_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const pm_token_t *opening, pm_node_t *parameters, pm_node_t *body, const pm_token_t *closing) {
     pm_block_node_t *node = PM_ALLOC_NODE(parser, pm_block_node_t);
 
     *node = (pm_block_node_t) {
@@ -1478,7 +1478,6 @@ pm_block_node_create(pm_parser_t *parser, pm_constant_id_list_t *locals, const p
         .locals = *locals,
         .parameters = parameters,
         .body = body,
-        .numbered_parameters = numbered_parameters,
         .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
         .closing_loc = PM_LOCATION_TOKEN_VALUE(closing)
     };
@@ -3958,9 +3957,8 @@ pm_lambda_node_create(
     const pm_token_t *operator,
     const pm_token_t *opening,
     const pm_token_t *closing,
-    pm_block_parameters_node_t *parameters,
-    pm_node_t *body,
-    uint32_t numbered_parameters
+    pm_node_t *parameters,
+    pm_node_t *body
 ) {
     pm_lambda_node_t *node = PM_ALLOC_NODE(parser, pm_lambda_node_t);
 
@@ -3977,8 +3975,7 @@ pm_lambda_node_create(
         .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
         .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
         .parameters = parameters,
-        .body = body,
-        .numbered_parameters = numbered_parameters
+        .body = body
     };
 
     return node;
@@ -4442,7 +4439,25 @@ pm_no_keywords_parameter_node_create(pm_parser_t *parser, const pm_token_t *oper
 }
 
 /**
- * Allocate a new NthReferenceReadNode node.
+ * Allocate and initialize a new NumberedParametersNode node.
+ */
+static pm_numbered_parameters_node_t *
+pm_numbered_parameters_node_create(pm_parser_t *parser, const pm_location_t *location, uint8_t maximum) {
+    pm_numbered_parameters_node_t *node = PM_ALLOC_NODE(parser, pm_numbered_parameters_node_t);
+
+    *node = (pm_numbered_parameters_node_t) {
+        {
+            .type = PM_NUMBERED_PARAMETERS_NODE,
+            .location = *location
+        },
+        .maximum = maximum
+    };
+
+    return node;
+}
+
+/**
+ * Allocate and initialize a new NthReferenceReadNode node.
  */
 static pm_numbered_reference_read_node_t *
 pm_numbered_reference_read_node_create(pm_parser_t *parser, const pm_token_t *name) {
@@ -5822,7 +5837,7 @@ pm_parser_local_add(pm_parser_t *parser, pm_constant_id_t constant_id) {
  * Set the numbered_parameters value of the current scope.
  */
 static inline void
-pm_parser_numbered_parameters_set(pm_parser_t *parser, uint32_t numbered_parameters) {
+pm_parser_numbered_parameters_set(pm_parser_t *parser, uint8_t numbered_parameters) {
     parser->current_scope->numbered_parameters = numbered_parameters;
 }
 
@@ -11845,24 +11860,24 @@ parse_block(pm_parser_t *parser) {
 
     pm_accepts_block_stack_push(parser, true);
     pm_parser_scope_push(parser, false);
-    pm_block_parameters_node_t *parameters = NULL;
+    pm_block_parameters_node_t *block_parameters = NULL;
 
     if (accept1(parser, PM_TOKEN_PIPE)) {
         parser->current_scope->explicit_params = true;
         pm_token_t block_parameters_opening = parser->previous;
 
         if (match1(parser, PM_TOKEN_PIPE)) {
-            parameters = pm_block_parameters_node_create(parser, NULL, &block_parameters_opening);
+            block_parameters = pm_block_parameters_node_create(parser, NULL, &block_parameters_opening);
             parser->command_start = true;
             parser_lex(parser);
         } else {
-            parameters = parse_block_parameters(parser, true, &block_parameters_opening, false);
+            block_parameters = parse_block_parameters(parser, true, &block_parameters_opening, false);
             accept1(parser, PM_TOKEN_NEWLINE);
             parser->command_start = true;
             expect1(parser, PM_TOKEN_PIPE, PM_ERR_BLOCK_PARAM_PIPE_TERM);
         }
 
-        pm_block_parameters_node_closing_set(parameters, &parser->previous);
+        pm_block_parameters_node_closing_set(block_parameters, &parser->previous);
     }
 
     accept1(parser, PM_TOKEN_NEWLINE);
@@ -11891,11 +11906,17 @@ parse_block(pm_parser_t *parser) {
         expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_BLOCK_TERM_END);
     }
 
+    pm_node_t *parameters = (pm_node_t *) block_parameters;
+    uint8_t maximum = parser->current_scope->numbered_parameters;
+
+    if (parameters == NULL && (maximum > 0)) {
+        parameters = (pm_node_t *) pm_numbered_parameters_node_create(parser, &(pm_location_t) { .start = opening.start, .end = parser->previous.end }, maximum);
+    }
+
     pm_constant_id_list_t locals = parser->current_scope->locals;
-    uint32_t numbered_parameters = parser->current_scope->numbered_parameters;
     pm_parser_scope_pop(parser);
     pm_accepts_block_stack_pop(parser);
-    return pm_block_node_create(parser, &locals, &opening, parameters, statements, &parser->previous, numbered_parameters);
+    return pm_block_node_create(parser, &locals, &opening, parameters, statements, &parser->previous);
 }
 
 /**
@@ -12511,10 +12532,10 @@ parse_variable_call(pm_parser_t *parser) {
 
                 // We subtract the value for the character '0' to get the actual
                 // integer value of the number (only _1 through _9 are valid)
-                uint32_t number_as_int = (uint32_t) (number - '0');
-                if (number_as_int > parser->current_scope->numbered_parameters) {
-                    parser->current_scope->numbered_parameters = number_as_int;
-                    pm_parser_numbered_parameters_set(parser, number_as_int);
+                uint8_t numbered_parameters = (uint8_t) (number - '0');
+                if (numbered_parameters > parser->current_scope->numbered_parameters) {
+                    parser->current_scope->numbered_parameters = numbered_parameters;
+                    pm_parser_numbered_parameters_set(parser, numbered_parameters);
                 }
 
                 // When you use a numbered parameter, it implies the existence
@@ -15707,7 +15728,7 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
 
             pm_token_t operator = parser->previous;
             pm_parser_scope_push(parser, false);
-            pm_block_parameters_node_t *params;
+            pm_block_parameters_node_t *block_parameters;
 
             switch (parser->current.type) {
                 case PM_TOKEN_PARENTHESIS_LEFT: {
@@ -15716,27 +15737,27 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
                     parser_lex(parser);
 
                     if (match1(parser, PM_TOKEN_PARENTHESIS_RIGHT)) {
-                        params = pm_block_parameters_node_create(parser, NULL, &opening);
+                        block_parameters = pm_block_parameters_node_create(parser, NULL, &opening);
                     } else {
-                        params = parse_block_parameters(parser, false, &opening, true);
+                        block_parameters = parse_block_parameters(parser, false, &opening, true);
                     }
 
                     accept1(parser, PM_TOKEN_NEWLINE);
                     expect1(parser, PM_TOKEN_PARENTHESIS_RIGHT, PM_ERR_EXPECT_RPAREN);
 
-                    pm_block_parameters_node_closing_set(params, &parser->previous);
+                    pm_block_parameters_node_closing_set(block_parameters, &parser->previous);
                     break;
                 }
                 case PM_CASE_PARAMETER: {
                     parser->current_scope->explicit_params = true;
                     pm_accepts_block_stack_push(parser, false);
                     pm_token_t opening = not_provided(parser);
-                    params = parse_block_parameters(parser, false, &opening, true);
+                    block_parameters = parse_block_parameters(parser, false, &opening, true);
                     pm_accepts_block_stack_pop(parser);
                     break;
                 }
                 default: {
-                    params = NULL;
+                    block_parameters = NULL;
                     break;
                 }
             }
@@ -15770,11 +15791,17 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
                 expect1(parser, PM_TOKEN_KEYWORD_END, PM_ERR_LAMBDA_TERM_END);
             }
 
+            pm_node_t *parameters = (pm_node_t *) block_parameters;
+            uint8_t maximum = parser->current_scope->numbered_parameters;
+
+            if (parameters == NULL && (maximum > 0)) {
+                parameters = (pm_node_t *) pm_numbered_parameters_node_create(parser, &(pm_location_t) { .start = operator.start, .end = parser->previous.end }, maximum);
+            }
+
             pm_constant_id_list_t locals = parser->current_scope->locals;
-            uint32_t numbered_parameters = parser->current_scope->numbered_parameters;
             pm_parser_scope_pop(parser);
             pm_accepts_block_stack_pop(parser);
-            return (pm_node_t *) pm_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, params, body, numbered_parameters);
+            return (pm_node_t *) pm_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, parameters, body);
         }
         case PM_TOKEN_UPLUS: {
             parser_lex(parser);
diff --git a/prism/templates/ext/prism/api_node.c.erb b/prism/templates/ext/prism/api_node.c.erb
index 5811cf2027..93f67f6551 100644
--- a/prism/templates/ext/prism/api_node.c.erb
+++ b/prism/templates/ext/prism/api_node.c.erb
@@ -181,6 +181,9 @@ pm_ast_new(pm_parser_t *parser, pm_node_t *node, rb_encoding *encoding) {
                     <%- when Prism::OptionalLocationField -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
                     argv[<%= index %>] = cast-><%= field.name %>.start == NULL ? Qnil : pm_location_new(parser, cast-><%= field.name %>.start, cast-><%= field.name %>.end, source);
+                    <%- when Prism::UInt8Field -%>
+#line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
+                    argv[<%= index %>] = UINT2NUM(cast-><%= field.name %>);
                     <%- when Prism::UInt32Field -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
                     argv[<%= index %>] = ULONG2NUM(cast-><%= field.name %>);
diff --git a/prism/templates/include/prism/ast.h.erb b/prism/templates/include/prism/ast.h.erb
index dd1c6bcd74..8670dc3d2a 100644
--- a/prism/templates/include/prism/ast.h.erb
+++ b/prism/templates/include/prism/ast.h.erb
@@ -168,6 +168,7 @@ typedef struct pm_<%= node.human %> {
     when Prism::ConstantListField then "pm_constant_id_list_t #{field.name}"
     when Prism::StringField then "pm_string_t #{field.name}"
     when Prism::LocationField, Prism::OptionalLocationField then "pm_location_t #{field.name}"
+    when Prism::UInt8Field then "uint8_t #{field.name}"
     when Prism::UInt32Field then "uint32_t #{field.name}"
     else raise field.class.name
     end
diff --git a/prism/templates/lib/prism/dot_visitor.rb.erb b/prism/templates/lib/prism/dot_visitor.rb.erb
index 45050935cc..5e01388c6d 100644
--- a/prism/templates/lib/prism/dot_visitor.rb.erb
+++ b/prism/templates/lib/prism/dot_visitor.rb.erb
@@ -129,7 +129,7 @@ module Prism
 
       digraph.edge("#{id}:<%= field.name %> -> #{waypoint};")
       node.<%= field.name %>.each { |child| digraph.edge("#{waypoint} -> #{node_id(child)};") }
-      <%- when Prism::StringField, Prism::ConstantField, Prism::OptionalConstantField, Prism::UInt32Field, Prism::ConstantListField -%>
+      <%- when Prism::StringField, Prism::ConstantField, Prism::OptionalConstantField, Prism::UInt8Field, Prism::UInt32Field, Prism::ConstantListField -%>
       table.field("<%= field.name %>", node.<%= field.name %>.inspect)
       <%- when Prism::LocationField -%>
       table.field("<%= field.name %>", location_inspect(node.<%= field.name %>))
diff --git a/prism/templates/lib/prism/node.rb.erb b/prism/templates/lib/prism/node.rb.erb
index 7148710238..87a94a0338 100644
--- a/prism/templates/lib/prism/node.rb.erb
+++ b/prism/templates/lib/prism/node.rb.erb
@@ -190,7 +190,7 @@ module Prism
         inspector << "<%= pointer %><%= field.name %>:\n"
         inspector << <%= field.name %>.inspect(inspector.child_inspector("<%= preadd %>")).delete_prefix(inspector.prefix)
       end
-      <%- when Prism::ConstantField, Prism::StringField, Prism::UInt32Field -%>
+      <%- when Prism::ConstantField, Prism::StringField, Prism::UInt8Field, Prism::UInt32Field -%>
       inspector << "<%= pointer %><%= field.name %>: #{<%= field.name %>.inspect}\n"
       <%- when Prism::OptionalConstantField -%>
       if (<%= field.name %> = self.<%= field.name %>).nil?
diff --git a/prism/templates/lib/prism/serialize.rb.erb b/prism/templates/lib/prism/serialize.rb.erb
index 350a502d6a..813a36e180 100644
--- a/prism/templates/lib/prism/serialize.rb.erb
+++ b/prism/templates/lib/prism/serialize.rb.erb
@@ -253,6 +253,7 @@ module Prism
               when Prism::ConstantListField then "Array.new(load_varuint) { load_required_constant }"
               when Prism::LocationField then "load_location"
               when Prism::OptionalLocationField then "load_optional_location"
+              when Prism::UInt8Field then "io.getbyte"
               when Prism::UInt32Field, Prism::FlagsField then "load_varuint"
               else raise
               end
@@ -286,6 +287,7 @@ module Prism
                 when Prism::ConstantListField then "Array.new(load_varuint) { load_required_constant }"
                 when Prism::LocationField then "load_location"
                 when Prism::OptionalLocationField then "load_optional_location"
+                when Prism::UInt8Field then "io.getbyte"
                 when Prism::UInt32Field, Prism::FlagsField then "load_varuint"
                 else raise
                 end
diff --git a/prism/templates/src/node.c.erb b/prism/templates/src/node.c.erb
index 0f3a6d8af2..0552767f4d 100644
--- a/prism/templates/src/node.c.erb
+++ b/prism/templates/src/node.c.erb
@@ -56,12 +56,12 @@ pm_node_destroy(pm_parser_t *parser, pm_node_t *node) {
         <%- nodes.each do |node| -%>
 #line <%= __LINE__ + 1 %> "<%= File.basename(__FILE__) %>"
         case <%= node.type %>: {
-            <%- if node.fields.any? { |field| ![Prism::LocationField, Prism::OptionalLocationField, Prism::UInt32Field, Prism::FlagsField, Prism::ConstantField, Prism::OptionalConstantField].include?(field.class) } -%>
+            <%- if node.fields.any? { |field| ![Prism::LocationField, Prism::OptionalLocationField, Prism::UInt8Field, Prism::UInt32Field, Prism::FlagsField, Prism::ConstantField, Prism::OptionalConstantField].include?(field.class) } -%>
             pm_<%= node.human %>_t *cast = (pm_<%= node.human %>_t *) node;
             <%- end -%>
             <%- node.fields.each do |field| -%>
             <%- case field -%>
-            <%- when Prism::LocationField, Prism::OptionalLocationField, Prism::UInt32Field, Prism::FlagsField, Prism::ConstantField, Prism::OptionalConstantField -%>
+            <%- when Prism::LocationField, Prism::OptionalLocationField, Prism::UInt8Field, Prism::UInt32Field, Prism::FlagsField, Prism::ConstantField, Prism::OptionalConstantField -%>
             <%- when Prism::NodeField -%>
             pm_node_destroy(parser, (pm_node_t *)cast-><%= field.name %>);
             <%- when Prism::OptionalNodeField -%>
@@ -113,7 +113,7 @@ pm_node_memsize_node(pm_node_t *node, pm_memsize_t *memsize) {
             <%- end -%>
             <%- node.fields.each do |field| -%>
             <%- case field -%>
-            <%- when Prism::ConstantField, Prism::OptionalConstantField, Prism::UInt32Field, Prism::FlagsField, Prism::LocationField, Prism::OptionalLocationField -%>
+            <%- when Prism::ConstantField, Prism::OptionalConstantField, Prism::UInt8Field, Prism::UInt32Field, Prism::FlagsField, Prism::LocationField, Prism::OptionalLocationField -%>
             <%- when Prism::NodeField -%>
             pm_node_memsize_node((pm_node_t *)cast-><%= field.name %>, memsize);
             <%- when Prism::OptionalNodeField -%>
diff --git a/prism/templates/src/prettyprint.c.erb b/prism/templates/src/prettyprint.c.erb
index ed820d5e77..61831ce59b 100644
--- a/prism/templates/src/prettyprint.c.erb
+++ b/prism/templates/src/prettyprint.c.erb
@@ -152,7 +152,7 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                     prettyprint_source(output_buffer, location->start, (size_t) (location->end - location->start));
                     pm_buffer_append_string(output_buffer, "\"\n", 2);
                 }
-            <%- when Prism::UInt32Field -%>
+            <%- when Prism::UInt8Field, Prism::UInt32Field -%>
                 pm_buffer_append_format(output_buffer, " %d\n", cast-><%= field.name %>);
             <%- when Prism::FlagsField -%>
                 bool found = false;
diff --git a/prism/templates/src/serialize.c.erb b/prism/templates/src/serialize.c.erb
index e82a8703b2..60cb9ecb3d 100644
--- a/prism/templates/src/serialize.c.erb
+++ b/prism/templates/src/serialize.c.erb
@@ -107,6 +107,8 @@ pm_serialize_node(pm_parser_t *parser, pm_node_t *node, pm_buffer_t *buffer) {
                 pm_serialize_location(parser, &((pm_<%= node.human %>_t *)node)-><%= field.name %>, buffer);
             }
             <%- end -%>
+            <%- when Prism::UInt8Field -%>
+            pm_buffer_append_byte(buffer, ((pm_<%= node.human %>_t *)node)-><%= field.name %>);
             <%- when Prism::UInt32Field -%>
             pm_buffer_append_varuint(buffer, ((pm_<%= node.human %>_t *)node)-><%= field.name %>);
             <%- when Prism::FlagsField -%>
diff --git a/prism/templates/template.rb b/prism/templates/template.rb
index 7c5e7cd316..8cbcf27d79 100755
--- a/prism/templates/template.rb
+++ b/prism/templates/template.rb
@@ -198,6 +198,21 @@ module Prism
   end
 
   # This represents an integer field.
+  class UInt8Field < Field
+    def rbs_class
+      "Integer"
+    end
+
+    def rbi_class
+      "Integer"
+    end
+
+    def java_type
+      "int"
+    end
+  end
+
+  # This represents an integer field.
   class UInt32Field < Field
     def rbs_class
       "Integer"
@@ -282,6 +297,7 @@ module Prism
       when "constant[]" then ConstantListField
       when "location"   then LocationField
       when "location?"  then OptionalLocationField
+      when "uint8"      then UInt8Field
       when "uint32"     then UInt32Field
       when "flags"      then FlagsField
       else raise("Unknown field type: #{name.inspect}")
diff --git a/test/prism/errors_test.rb b/test/prism/errors_test.rb
index bef5bd3eaf..a7683aa430 100644
--- a/test/prism/errors_test.rb
+++ b/test/prism/errors_test.rb
@@ -452,8 +452,7 @@ module Prism
               nil,
               StatementsNode([ModuleNode([], Location(), ConstantReadNode(:Foo), nil, Location(), :Foo)]),
               Location(),
-              Location(),
-              0
+              Location()
             ),
             0
           )]
@@ -645,8 +644,7 @@ module Prism
           Location(),
           Location()
         ),
-        nil,
-        0
+        nil
       )
       assert_errors expected, "-> (a, b, ) {}", [
         ["unexpected `,` in parameters", 8..9]
@@ -1022,8 +1020,7 @@ module Prism
         Location(),
         Location(),
         BlockParametersNode(ParametersNode([], [], nil, [], [], ForwardingParameterNode(), nil), [], Location(), Location()),
-        nil,
-        0
+        nil
       )
 
       assert_errors expected, "->(...) {}", [
@@ -1045,8 +1042,7 @@ module Prism
           BlockParametersNode(ParametersNode([], [], nil, [], [], ForwardingParameterNode(), nil), [], Location(), Location()),
           nil,
           Location(),
-          Location(),
-          0
+          Location()
         ),
         0
       )
diff --git a/test/prism/location_test.rb b/test/prism/location_test.rb
index 26415ab0c6..b6bfa64b50 100644
--- a/test/prism/location_test.rb
+++ b/test/prism/location_test.rb
@@ -619,6 +619,11 @@ module Prism
       assert_location(NoKeywordsParameterNode, "def foo(**nil); end", 8...13) { |node| node.parameters.keyword_rest }
     end
 
+    def test_NumberedParametersNode
+      assert_location(NumberedParametersNode, "-> { _1 }", &:parameters)
+      assert_location(NumberedParametersNode, "foo { _1 }", 4...10) { |node| node.block.parameters }
+    end
+
     def test_NumberedReferenceReadNode
       assert_location(NumberedReferenceReadNode, "$1")
     end
diff --git a/test/prism/snapshots/begin_ensure.txt b/test/prism/snapshots/begin_ensure.txt
index 6cf3b5558a..14698a263e 100644
--- a/test/prism/snapshots/begin_ensure.txt
+++ b/test/prism/snapshots/begin_ensure.txt
@@ -227,14 +227,12 @@
             │           │           │   │       │   │           │   │           │   │           │   ├── parameters: ∅
             │           │           │   │       │   │           │   │           │   │           │   ├── body: ∅
             │           │           │   │       │   │           │   │           │   │           │   ├── opening_loc: (18,22)-(18,24) = "do"
-            │           │           │   │       │   │           │   │           │   │           │   ├── closing_loc: (19,4)-(19,7) = "end"
-            │           │           │   │       │   │           │   │           │   │           │   └── numbered_parameters: 0
+            │           │           │   │       │   │           │   │           │   │           │   └── closing_loc: (19,4)-(19,7) = "end"
             │           │           │   │       │   │           │   │           │   │           └── flags: ∅
             │           │           │   │       │   │           │   │           │   └── end_keyword_loc: (20,2)-(20,5) = "end"
             │           │           │   │       │   │           │   │           └── end_keyword_loc: (20,2)-(20,5) = "end"
             │           │           │   │       │   │           │   ├── opening_loc: (15,40)-(15,42) = "do"
-            │           │           │   │       │   │           │   ├── closing_loc: (21,0)-(21,3) = "end"
-            │           │           │   │       │   │           │   └── numbered_parameters: 0
+            │           │           │   │       │   │           │   └── closing_loc: (21,0)-(21,3) = "end"
             │           │           │   │       │   │           └── flags: ∅
             │           │           │   │       │   └── end_keyword_loc: (21,4)-(21,7) = "end"
             │           │           │   │       └── end_keyword_loc: (21,4)-(21,7) = "end"
diff --git a/test/prism/snapshots/blocks.txt b/test/prism/snapshots/blocks.txt
index d3005d1c17..6dd117ab4a 100644
--- a/test/prism/snapshots/blocks.txt
+++ b/test/prism/snapshots/blocks.txt
@@ -52,8 +52,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (1,9)-(1,10) = "{"
-        │   │   ├── closing_loc: (1,15)-(1,16) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,15)-(1,16) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(5,3))
         │   ├── receiver:
@@ -104,8 +103,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (3,9)-(3,11) = "do"
-        │   │   ├── closing_loc: (5,0)-(5,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,0)-(5,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,35))
         │   ├── receiver:
@@ -165,8 +163,7 @@
         │   │   │           ├── operator: :+
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (7,12)-(7,13) = "{"
-        │   │   ├── closing_loc: (7,34)-(7,35) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (7,34)-(7,35) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,10))
         │   ├── receiver: ∅
@@ -182,8 +179,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,4)-(9,6) = "do"
-        │   │   ├── closing_loc: (9,7)-(9,10) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (9,7)-(9,10) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,21))
         │   ├── receiver: ∅
@@ -222,8 +218,7 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (11,14)-(11,16) = "do"
-        │   │   │       │           │   ├── closing_loc: (11,17)-(11,20) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (11,17)-(11,20) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── opening_loc: (11,9)-(11,10) = "("
         │   │   │       └── closing_loc: (11,20)-(11,21) = ")"
@@ -258,8 +253,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,8)-(13,10) = "do"
-        │   │   ├── closing_loc: (13,11)-(13,14) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (13,11)-(13,14) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,18))
         │   ├── receiver: ∅
@@ -301,8 +295,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,12)-(15,14) = "do"
-        │   │   ├── closing_loc: (15,15)-(15,18) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (15,15)-(15,18) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(18,3))
         │   ├── receiver: ∅
@@ -361,8 +354,7 @@
         │   │   │   └── closing_loc: (17,16)-(17,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,4)-(17,6) = "do"
-        │   │   ├── closing_loc: (18,0)-(18,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (18,0)-(18,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (20,0)-(22,3))
         │   ├── receiver: ∅
@@ -392,8 +384,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (22,0)-(22,3) = "end"
         │   │   ├── opening_loc: (20,4)-(20,6) = "do"
-        │   │   ├── closing_loc: (22,0)-(22,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (22,0)-(22,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (24,0)-(29,3))
         │   ├── receiver: ∅
@@ -439,16 +430,13 @@
         │   │   │           │   │           │   ├── parameters: ∅
         │   │   │           │   │           │   ├── body: ∅
         │   │   │           │   │           │   ├── opening_loc: (26,8)-(26,10) = "do"
-        │   │   │           │   │           │   ├── closing_loc: (27,4)-(27,7) = "end"
-        │   │   │           │   │           │   └── numbered_parameters: 0
+        │   │   │           │   │           │   └── closing_loc: (27,4)-(27,7) = "end"
         │   │   │           │   │           └── flags: ∅
         │   │   │           │   ├── opening_loc: (25,6)-(25,8) = "do"
-        │   │   │           │   ├── closing_loc: (28,2)-(28,5) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (28,2)-(28,5) = "end"
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (24,4)-(24,6) = "do"
-        │   │   ├── closing_loc: (29,0)-(29,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (29,0)-(29,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,16))
         │   ├── receiver:
@@ -499,8 +487,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (31,9)-(31,10) = "{"
-        │   │   ├── closing_loc: (31,15)-(31,16) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (31,15)-(31,16) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,24))
         │   ├── receiver: ∅
@@ -546,8 +533,7 @@
         │   │   │           ├── name: :x
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (33,4)-(33,5) = "{"
-        │   │   ├── closing_loc: (33,23)-(33,24) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (33,23)-(33,24) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,11))
         │   ├── receiver: ∅
@@ -578,8 +564,7 @@
         │   │   │   └── closing_loc: (35,8)-(35,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,4)-(35,5) = "{"
-        │   │   ├── closing_loc: (35,10)-(35,11) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (35,10)-(35,11) = "}"
         │   └── flags: ∅
         ├── @ LocalVariableWriteNode (location: (37,0)-(37,8))
         │   ├── name: :fork
@@ -618,8 +603,7 @@
         │   │   │   └── closing_loc: (38,10)-(38,11) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (38,5)-(38,7) = "do"
-        │   │   ├── closing_loc: (39,0)-(39,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (39,0)-(39,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(41,12))
         │   ├── receiver: ∅
@@ -650,8 +634,7 @@
         │   │   │   └── closing_loc: (41,9)-(41,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (41,5)-(41,6) = "{"
-        │   │   ├── closing_loc: (41,11)-(41,12) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (41,11)-(41,12) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (43,0)-(44,3))
         │   ├── receiver: ∅
@@ -667,8 +650,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (43,2)-(43,4) = "do"
-        │   │   ├── closing_loc: (44,0)-(44,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (44,0)-(44,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (46,0)-(46,4))
         │   ├── receiver: ∅
@@ -684,8 +666,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (46,2)-(46,3) = "{"
-        │   │   ├── closing_loc: (46,3)-(46,4) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (46,3)-(46,4) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (48,0)-(52,1))
         │   ├── receiver: ∅
@@ -735,8 +716,7 @@
         │   │   │       │   │   └── closing_loc: (51,2)-(51,3) = "|"
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (48,11)-(48,12) = "{"
-        │   │   │       │   ├── closing_loc: (52,0)-(52,1) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (52,0)-(52,1) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -772,6 +752,5 @@
             │   │   └── closing_loc: (54,12)-(54,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (54,4)-(54,6) = "do"
-            │   ├── closing_loc: (54,14)-(54,17) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (54,14)-(54,17) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/break.txt b/test/prism/snapshots/break.txt
index c89b865590..48991bb6eb 100644
--- a/test/prism/snapshots/break.txt
+++ b/test/prism/snapshots/break.txt
@@ -151,8 +151,7 @@
         │   │   │   │           │   └── flags: ∅
         │   │   │   │           └── keyword_loc: (23,6)-(23,11) = "break"
         │   │   │   ├── opening_loc: (23,4)-(23,5) = "{"
-        │   │   │   ├── closing_loc: (23,15)-(23,16) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (23,15)-(23,16) = "}"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: ∅
         │   ├── name: :==
@@ -203,8 +202,7 @@
             │   │   │           ├── arguments: ∅
             │   │   │           └── keyword_loc: (25,10)-(25,15) = "break"
             │   │   ├── opening_loc: (25,4)-(25,5) = "{"
-            │   │   ├── closing_loc: (25,16)-(25,17) = "}"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (25,16)-(25,17) = "}"
             │   └── flags: ∅
             ├── call_operator_loc: ∅
             ├── name: :==
diff --git a/test/prism/snapshots/hashes.txt b/test/prism/snapshots/hashes.txt
index 12165632c4..824def5ca1 100644
--- a/test/prism/snapshots/hashes.txt
+++ b/test/prism/snapshots/hashes.txt
@@ -351,6 +351,5 @@
             │   │           │       └── operator_loc: ∅
             │   │           └── closing_loc: (25,19)-(25,20) = "}"
             │   ├── opening_loc: (23,4)-(23,6) = "do"
-            │   ├── closing_loc: (26,0)-(26,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (26,0)-(26,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/if.txt b/test/prism/snapshots/if.txt
index ecdb1f3502..b48b58d1c0 100644
--- a/test/prism/snapshots/if.txt
+++ b/test/prism/snapshots/if.txt
@@ -364,8 +364,7 @@
             │           │   │   └── closing_loc: (34,14)-(34,15) = "|"
             │           │   ├── body: ∅
             │           │   ├── opening_loc: (34,9)-(34,11) = "do"
-            │           │   ├── closing_loc: (35,2)-(35,5) = "end"
-            │           │   └── numbered_parameters: 0
+            │           │   └── closing_loc: (35,2)-(35,5) = "end"
             │           └── flags: ∅
             ├── consequent:
             │   @ IfNode (location: (36,0)-(42,3))
@@ -406,8 +405,7 @@
             │   │           │   │   └── closing_loc: (37,14)-(37,15) = "|"
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (37,9)-(37,11) = "do"
-            │   │           │   ├── closing_loc: (38,2)-(38,5) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (38,2)-(38,5) = "end"
             │   │           └── flags: ∅
             │   ├── consequent:
             │   │   @ ElseNode (location: (39,0)-(42,3))
@@ -444,8 +442,7 @@
             │   │   │           │   │   └── closing_loc: (40,14)-(40,15) = "|"
             │   │   │           │   ├── body: ∅
             │   │   │           │   ├── opening_loc: (40,9)-(40,11) = "do"
-            │   │   │           │   ├── closing_loc: (41,2)-(41,5) = "end"
-            │   │   │           │   └── numbered_parameters: 0
+            │   │   │           │   └── closing_loc: (41,2)-(41,5) = "end"
             │   │   │           └── flags: ∅
             │   │   └── end_keyword_loc: (42,0)-(42,3) = "end"
             │   └── end_keyword_loc: (42,0)-(42,3) = "end"
diff --git a/test/prism/snapshots/keyword_method_names.txt b/test/prism/snapshots/keyword_method_names.txt
index c12bb2c6f3..0714fa3d4b 100644
--- a/test/prism/snapshots/keyword_method_names.txt
+++ b/test/prism/snapshots/keyword_method_names.txt
@@ -61,8 +61,7 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (8,6)-(8,8) = "do"
-        │   │   │       │           │   ├── closing_loc: (9,2)-(9,5) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (9,2)-(9,5) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── locals: []
         │   │   │       ├── def_keyword_loc: (7,8)-(7,11) = "def"
diff --git a/test/prism/snapshots/lambda.txt b/test/prism/snapshots/lambda.txt
index 6e35f418ca..8e358b2709 100644
--- a/test/prism/snapshots/lambda.txt
+++ b/test/prism/snapshots/lambda.txt
@@ -24,8 +24,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (3,0)-(3,1) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (5,0)-(5,18))
         │   ├── locals: [:x]
         │   ├── operator_loc: (5,0)-(5,2) = "->"
@@ -75,8 +74,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (5,2)-(5,3) = "("
         │   │   └── closing_loc: (5,13)-(5,14) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (7,0)-(7,15))
         │   ├── locals: [:a]
         │   ├── operator_loc: (7,0)-(7,2) = "->"
@@ -125,8 +123,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (7,2)-(7,3) = "("
         │   │   └── closing_loc: (7,11)-(7,12) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (9,0)-(9,19))
         │   ├── locals: [:foo]
         │   ├── operator_loc: (9,0)-(9,2) = "->"
@@ -161,8 +158,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ LambdaNode (location: (11,0)-(11,18))
             ├── locals: [:foo]
             ├── operator_loc: (11,0)-(11,2) = "->"
@@ -196,5 +192,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/method_calls.txt b/test/prism/snapshots/method_calls.txt
index 05306927d9..57c233fb51 100644
--- a/test/prism/snapshots/method_calls.txt
+++ b/test/prism/snapshots/method_calls.txt
@@ -956,8 +956,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (64,16)-(64,18) = "do"
-        │   │   ├── closing_loc: (64,33)-(64,36) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (64,33)-(64,36) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (66,0)-(66,17))
         │   ├── receiver: ∅
@@ -1349,8 +1348,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (93,7)-(93,8) = "{"
-        │   │   ├── closing_loc: (93,9)-(93,10) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (93,9)-(93,10) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (95,0)-(95,14))
         │   ├── receiver:
@@ -1380,8 +1378,7 @@
         │   │   │       └── @ BackReferenceReadNode (location: (95,10)-(95,12))
         │   │   │           └── name: :$&
         │   │   ├── opening_loc: (95,8)-(95,9) = "{"
-        │   │   ├── closing_loc: (95,13)-(95,14) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (95,13)-(95,14) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (97,0)-(97,12))
         │   ├── receiver:
@@ -1465,8 +1462,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (101,14)-(101,15) = "{"
-        │   │   ├── closing_loc: (101,16)-(101,17) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (101,16)-(101,17) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (103,0)-(103,12))
         │   ├── receiver: ∅
@@ -1538,8 +1534,7 @@
         │   │   │               │   │       │   │   ├── parameters: ∅
         │   │   │               │   │       │   │   ├── body: ∅
         │   │   │               │   │       │   │   ├── opening_loc: (105,20)-(105,22) = "do"
-        │   │   │               │   │       │   │   ├── closing_loc: (105,23)-(105,26) = "end"
-        │   │   │               │   │       │   │   └── numbered_parameters: 0
+        │   │   │               │   │       │   │   └── closing_loc: (105,23)-(105,26) = "end"
         │   │   │               │   │       │   └── flags: ∅
         │   │   │               │   │       └── operator_loc: ∅
         │   │   │               │   └── closing_loc: (105,27)-(105,28) = "}"
@@ -1586,8 +1581,7 @@
         │   │   │               │   │       │   │   ├── parameters: ∅
         │   │   │               │   │       │   │   ├── body: ∅
         │   │   │               │   │       │   │   ├── opening_loc: (107,16)-(107,18) = "do"
-        │   │   │               │   │       │   │   ├── closing_loc: (107,19)-(107,22) = "end"
-        │   │   │               │   │       │   │   └── numbered_parameters: 0
+        │   │   │               │   │       │   │   └── closing_loc: (107,19)-(107,22) = "end"
         │   │   │               │   │       │   └── flags: ∅
         │   │   │               │   │       └── operator_loc: (107,11)-(107,13) = "**"
         │   │   │               │   └── closing_loc: (107,23)-(107,24) = "}"
@@ -1645,8 +1639,7 @@
         │   │   │       │       │           │   │           ├── closing_loc: (109,22)-(109,23) = "\""
         │   │   │       │       │           │   │           └── unescaped: "baz"
         │   │   │       │       │           │   ├── opening_loc: (109,15)-(109,17) = "do"
-        │   │   │       │       │           │   ├── closing_loc: (109,24)-(109,27) = "end"
-        │   │   │       │       │           │   └── numbered_parameters: 0
+        │   │   │       │       │           │   └── closing_loc: (109,24)-(109,27) = "end"
         │   │   │       │       │           └── flags: ∅
         │   │   │       │       └── closing_loc: (109,27)-(109,28) = "}"
         │   │   │       └── closing_loc: (109,28)-(109,29) = "\""
@@ -1658,8 +1651,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (109,30)-(109,32) = "do"
-        │   │   ├── closing_loc: (109,33)-(109,36) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (109,33)-(109,36) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (111,0)-(111,28))
         │   ├── receiver: ∅
@@ -1695,8 +1687,7 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (111,18)-(111,20) = "do"
-        │   │   │       │           │   ├── closing_loc: (111,21)-(111,24) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (111,21)-(111,24) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── end_keyword_loc: (111,25)-(111,28) = "end"
         │   │   │       └── name: :Bar
@@ -1736,8 +1727,7 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (113,19)-(113,21) = "do"
-        │   │   │       │           │   ├── closing_loc: (113,22)-(113,25) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (113,22)-(113,25) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── end_keyword_loc: (113,26)-(113,29) = "end"
         │   │   │       └── name: :Bar
@@ -1770,8 +1760,7 @@
         │   │   │       │       │   ├── parameters: ∅
         │   │   │       │       │   ├── body: ∅
         │   │   │       │       │   ├── opening_loc: (115,9)-(115,11) = "do"
-        │   │   │       │       │   ├── closing_loc: (115,12)-(115,15) = "end"
-        │   │   │       │       │   └── numbered_parameters: 0
+        │   │   │       │       │   └── closing_loc: (115,12)-(115,15) = "end"
         │   │   │       │       └── flags: ∅
         │   │   │       ├── opening_loc: (115,4)-(115,5) = "["
         │   │   │       ├── closing_loc: (115,15)-(115,16) = "]"
@@ -1814,8 +1803,7 @@
         │   │   │       │           │   │       └── @ IntegerNode (location: (117,19)-(117,20))
         │   │   │       │           │   │           └── flags: decimal
         │   │   │       │           │   ├── opening_loc: (117,16)-(117,18) = "do"
-        │   │   │       │           │   ├── closing_loc: (117,21)-(117,24) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (117,21)-(117,24) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── rescue_clause: ∅
         │   │   │       ├── else_clause: ∅
@@ -1890,8 +1878,7 @@
         │   │   │       │           │   │           ├── name: :a
         │   │   │       │           │   │           └── depth: 0
         │   │   │       │           │   ├── opening_loc: (121,8)-(121,10) = "do"
-        │   │   │       │           │   ├── closing_loc: (123,4)-(123,7) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (123,4)-(123,7) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       ├── consequent: ∅
         │   │   │       └── end_keyword_loc: (124,2)-(124,5) = "end"
@@ -1964,8 +1951,7 @@
         │   │   │   │   │           │   │           ├── name: :a
         │   │   │   │   │           │   │           └── depth: 0
         │   │   │   │   │           │   ├── opening_loc: (128,8)-(128,10) = "do"
-        │   │   │   │   │           │   ├── closing_loc: (130,4)-(130,7) = "end"
-        │   │   │   │   │           │   └── numbered_parameters: 0
+        │   │   │   │   │           │   └── closing_loc: (130,4)-(130,7) = "end"
         │   │   │   │   │           └── flags: ∅
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ UntilNode (location: (132,2)-(135,5))
@@ -1999,8 +1985,7 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (133,8)-(133,10) = "do"
-        │   │   │       │           │   ├── closing_loc: (134,4)-(134,7) = "end"
-        │   │   │       │           │   └── numbered_parameters: 0
+        │   │   │       │           │   └── closing_loc: (134,4)-(134,7) = "end"
         │   │   │       │           └── flags: ∅
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
@@ -2034,8 +2019,7 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (137,7)-(137,8) = "{"
-        │   │   │       │   ├── closing_loc: (137,8)-(137,9) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (137,8)-(137,9) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2088,8 +2072,7 @@
         │   │   │       │   │           ├── name: :a
         │   │   │       │   │           └── depth: 0
         │   │   │       │   ├── opening_loc: (139,7)-(139,8) = "{"
-        │   │   │       │   ├── closing_loc: (139,15)-(139,16) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (139,15)-(139,16) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2111,8 +2094,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (141,2)-(141,3) = "{"
-        │   │   │   ├── closing_loc: (141,3)-(141,4) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (141,3)-(141,4) = "}"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: ∅
         │   ├── name: :+
@@ -2135,8 +2117,7 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (141,9)-(141,10) = "{"
-        │   │   │       │   ├── closing_loc: (141,10)-(141,11) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (141,10)-(141,11) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2175,8 +2156,7 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (143,9)-(143,10) = "{"
-        │   │   │       │   ├── closing_loc: (143,10)-(143,11) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (143,10)-(143,11) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
diff --git a/test/prism/snapshots/methods.txt b/test/prism/snapshots/methods.txt
index 960264f6a8..b185e1ef42 100644
--- a/test/prism/snapshots/methods.txt
+++ b/test/prism/snapshots/methods.txt
@@ -1583,8 +1583,7 @@
         │   │           │   │       │   ├── parameters: ∅
         │   │           │   │       │   ├── body: ∅
         │   │           │   │       │   ├── opening_loc: (161,12)-(161,13) = "{"
-        │   │           │   │       │   ├── closing_loc: (161,13)-(161,14) = "}"
-        │   │           │   │       │   └── numbered_parameters: 0
+        │   │           │   │       │   └── closing_loc: (161,13)-(161,14) = "}"
         │   │           │   │       └── flags: ∅
         │   │           │   └── flags: ∅
         │   │           ├── closing_loc: ∅
diff --git a/test/prism/snapshots/patterns.txt b/test/prism/snapshots/patterns.txt
index dd5884bf51..44e15fb644 100644
--- a/test/prism/snapshots/patterns.txt
+++ b/test/prism/snapshots/patterns.txt
@@ -485,13 +485,12 @@
         │   │   ├── opening_loc: (26,10)-(26,11) = "{"
         │   │   ├── closing_loc: (26,16)-(26,17) = "}"
         │   │   ├── parameters: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (26,12)-(26,15))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableReadNode (location: (26,12)-(26,15))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 1
-        │   │   └── numbered_parameters: 0
+        │   │   └── body:
+        │   │       @ StatementsNode (location: (26,12)-(26,15))
+        │   │       └── body: (length: 1)
+        │   │           └── @ LocalVariableReadNode (location: (26,12)-(26,15))
+        │   │               ├── name: :bar
+        │   │               └── depth: 1
         │   └── operator_loc: (26,4)-(26,6) = "=>"
         ├── @ MatchRequiredNode (location: (28,0)-(28,13))
         │   ├── value:
@@ -1190,13 +1189,12 @@
         │   │   │   ├── opening_loc: (52,10)-(52,11) = "{"
         │   │   │   ├── closing_loc: (52,16)-(52,17) = "}"
         │   │   │   ├── parameters: ∅
-        │   │   │   ├── body:
-        │   │   │   │   @ StatementsNode (location: (52,12)-(52,15))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ LocalVariableReadNode (location: (52,12)-(52,15))
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           └── depth: 1
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── body:
+        │   │   │       @ StatementsNode (location: (52,12)-(52,15))
+        │   │   │       └── body: (length: 1)
+        │   │   │           └── @ LocalVariableReadNode (location: (52,12)-(52,15))
+        │   │   │               ├── name: :bar
+        │   │   │               └── depth: 1
         │   │   ├── right:
         │   │   │   @ LambdaNode (location: (52,21)-(52,31))
         │   │   │   ├── locals: []
@@ -1204,13 +1202,12 @@
         │   │   │   ├── opening_loc: (52,24)-(52,25) = "{"
         │   │   │   ├── closing_loc: (52,30)-(52,31) = "}"
         │   │   │   ├── parameters: ∅
-        │   │   │   ├── body:
-        │   │   │   │   @ StatementsNode (location: (52,26)-(52,29))
-        │   │   │   │   └── body: (length: 1)
-        │   │   │   │       └── @ LocalVariableReadNode (location: (52,26)-(52,29))
-        │   │   │   │           ├── name: :bar
-        │   │   │   │           └── depth: 1
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── body:
+        │   │   │       @ StatementsNode (location: (52,26)-(52,29))
+        │   │   │       └── body: (length: 1)
+        │   │   │           └── @ LocalVariableReadNode (location: (52,26)-(52,29))
+        │   │   │               ├── name: :bar
+        │   │   │               └── depth: 1
         │   │   ├── operator_loc: (52,18)-(52,20) = ".."
         │   │   └── flags: ∅
         │   └── operator_loc: (52,4)-(52,6) = "=>"
@@ -2790,13 +2787,12 @@
         │   │   ├── opening_loc: (125,10)-(125,11) = "{"
         │   │   ├── closing_loc: (125,16)-(125,17) = "}"
         │   │   ├── parameters: ∅
-        │   │   ├── body:
-        │   │   │   @ StatementsNode (location: (125,12)-(125,15))
-        │   │   │   └── body: (length: 1)
-        │   │   │       └── @ LocalVariableReadNode (location: (125,12)-(125,15))
-        │   │   │           ├── name: :bar
-        │   │   │           └── depth: 1
-        │   │   └── numbered_parameters: 0
+        │   │   └── body:
+        │   │       @ StatementsNode (location: (125,12)-(125,15))
+        │   │       └── body: (length: 1)
+        │   │           └── @ LocalVariableReadNode (location: (125,12)-(125,15))
+        │   │               ├── name: :bar
+        │   │               └── depth: 1
         │   └── operator_loc: (125,4)-(125,6) = "in"
         ├── @ CaseMatchNode (location: (127,0)-(127,25))
         │   ├── predicate:
@@ -3457,13 +3453,12 @@
         │   │       │   ├── opening_loc: (152,16)-(152,17) = "{"
         │   │       │   ├── closing_loc: (152,22)-(152,23) = "}"
         │   │       │   ├── parameters: ∅
-        │   │       │   ├── body:
-        │   │       │   │   @ StatementsNode (location: (152,18)-(152,21))
-        │   │       │   │   └── body: (length: 1)
-        │   │       │   │       └── @ LocalVariableReadNode (location: (152,18)-(152,21))
-        │   │       │   │           ├── name: :bar
-        │   │       │   │           └── depth: 1
-        │   │       │   └── numbered_parameters: 0
+        │   │       │   └── body:
+        │   │       │       @ StatementsNode (location: (152,18)-(152,21))
+        │   │       │       └── body: (length: 1)
+        │   │       │           └── @ LocalVariableReadNode (location: (152,18)-(152,21))
+        │   │       │               ├── name: :bar
+        │   │       │               └── depth: 1
         │   │       ├── statements: ∅
         │   │       ├── in_loc: (152,10)-(152,12) = "in"
         │   │       └── then_loc: (152,24)-(152,28) = "then"
@@ -4439,13 +4434,12 @@
         │   │       │   │           ├── opening_loc: (179,16)-(179,17) = "{"
         │   │       │   │           ├── closing_loc: (179,22)-(179,23) = "}"
         │   │       │   │           ├── parameters: ∅
-        │   │       │   │           ├── body:
-        │   │       │   │           │   @ StatementsNode (location: (179,18)-(179,21))
-        │   │       │   │           │   └── body: (length: 1)
-        │   │       │   │           │       └── @ LocalVariableReadNode (location: (179,18)-(179,21))
-        │   │       │   │           │           ├── name: :bar
-        │   │       │   │           │           └── depth: 1
-        │   │       │   │           └── numbered_parameters: 0
+        │   │       │   │           └── body:
+        │   │       │   │               @ StatementsNode (location: (179,18)-(179,21))
+        │   │       │   │               └── body: (length: 1)
+        │   │       │   │                   └── @ LocalVariableReadNode (location: (179,18)-(179,21))
+        │   │       │   │                       ├── name: :bar
+        │   │       │   │                       └── depth: 1
         │   │       │   ├── consequent: ∅
         │   │       │   └── end_keyword_loc: ∅
         │   │       ├── statements: ∅
@@ -4680,6 +4674,5 @@
             │   │           │   └── operator_loc: (199,23)-(199,25) = "=>"
             │   │           └── operator_loc: (199,9)-(199,11) = "=>"
             │   ├── opening_loc: (198,4)-(198,6) = "do"
-            │   ├── closing_loc: (200,0)-(200,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (200,0)-(200,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/procs.txt b/test/prism/snapshots/procs.txt
index 6af836e830..25783cfb34 100644
--- a/test/prism/snapshots/procs.txt
+++ b/test/prism/snapshots/procs.txt
@@ -30,102 +30,97 @@
         │   │   │       └── name: :d
         │   │   ├── opening_loc: (1,3)-(1,4) = "("
         │   │   └── closing_loc: (1,14)-(1,15) = ")"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,18)-(1,19))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (1,18)-(1,19))
-        │   │           ├── name: :b
-        │   │           └── depth: 0
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (1,18)-(1,19))
+        │       └── body: (length: 1)
+        │           └── @ LocalVariableReadNode (location: (1,18)-(1,19))
+        │               ├── name: :b
+        │               └── depth: 0
         ├── @ LambdaNode (location: (3,0)-(5,3))
         │   ├── locals: []
         │   ├── operator_loc: (3,0)-(3,2) = "->"
         │   ├── opening_loc: (3,3)-(3,5) = "do"
         │   ├── closing_loc: (5,0)-(5,3) = "end"
         │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (4,0)-(5,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause: ∅
-        │   │   ├── else_clause: ∅
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (4,0)-(5,3))
-        │   │   │   ├── ensure_keyword_loc: (4,0)-(4,6) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ BeginNode (location: (4,0)-(5,3))
+        │       ├── begin_keyword_loc: ∅
+        │       ├── statements: ∅
+        │       ├── rescue_clause: ∅
+        │       ├── else_clause: ∅
+        │       ├── ensure_clause:
+        │       │   @ EnsureNode (location: (4,0)-(5,3))
+        │       │   ├── ensure_keyword_loc: (4,0)-(4,6) = "ensure"
+        │       │   ├── statements: ∅
+        │       │   └── end_keyword_loc: (5,0)-(5,3) = "end"
+        │       └── end_keyword_loc: (5,0)-(5,3) = "end"
         ├── @ LambdaNode (location: (7,0)-(11,3))
         │   ├── locals: []
         │   ├── operator_loc: (7,0)-(7,2) = "->"
         │   ├── opening_loc: (7,3)-(7,5) = "do"
         │   ├── closing_loc: (11,0)-(11,3) = "end"
         │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ BeginNode (location: (8,0)-(11,3))
-        │   │   ├── begin_keyword_loc: ∅
-        │   │   ├── statements: ∅
-        │   │   ├── rescue_clause:
-        │   │   │   @ RescueNode (location: (8,0)-(8,6))
-        │   │   │   ├── keyword_loc: (8,0)-(8,6) = "rescue"
-        │   │   │   ├── exceptions: (length: 0)
-        │   │   │   ├── operator_loc: ∅
-        │   │   │   ├── reference: ∅
-        │   │   │   ├── statements: ∅
-        │   │   │   └── consequent: ∅
-        │   │   ├── else_clause:
-        │   │   │   @ ElseNode (location: (9,0)-(10,6))
-        │   │   │   ├── else_keyword_loc: (9,0)-(9,4) = "else"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (10,0)-(10,6) = "ensure"
-        │   │   ├── ensure_clause:
-        │   │   │   @ EnsureNode (location: (10,0)-(11,3))
-        │   │   │   ├── ensure_keyword_loc: (10,0)-(10,6) = "ensure"
-        │   │   │   ├── statements: ∅
-        │   │   │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        │   │   └── end_keyword_loc: (11,0)-(11,3) = "end"
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ BeginNode (location: (8,0)-(11,3))
+        │       ├── begin_keyword_loc: ∅
+        │       ├── statements: ∅
+        │       ├── rescue_clause:
+        │       │   @ RescueNode (location: (8,0)-(8,6))
+        │       │   ├── keyword_loc: (8,0)-(8,6) = "rescue"
+        │       │   ├── exceptions: (length: 0)
+        │       │   ├── operator_loc: ∅
+        │       │   ├── reference: ∅
+        │       │   ├── statements: ∅
+        │       │   └── consequent: ∅
+        │       ├── else_clause:
+        │       │   @ ElseNode (location: (9,0)-(10,6))
+        │       │   ├── else_keyword_loc: (9,0)-(9,4) = "else"
+        │       │   ├── statements: ∅
+        │       │   └── end_keyword_loc: (10,0)-(10,6) = "ensure"
+        │       ├── ensure_clause:
+        │       │   @ EnsureNode (location: (10,0)-(11,3))
+        │       │   ├── ensure_keyword_loc: (10,0)-(10,6) = "ensure"
+        │       │   ├── statements: ∅
+        │       │   └── end_keyword_loc: (11,0)-(11,3) = "end"
+        │       └── end_keyword_loc: (11,0)-(11,3) = "end"
         ├── @ LambdaNode (location: (13,0)-(13,10))
         │   ├── locals: []
         │   ├── operator_loc: (13,0)-(13,2) = "->"
         │   ├── opening_loc: (13,3)-(13,4) = "{"
         │   ├── closing_loc: (13,9)-(13,10) = "}"
         │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (13,5)-(13,8))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (13,5)-(13,8))
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (13,5)-(13,8) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           ├── block: ∅
-        │   │           └── flags: variable_call
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (13,5)-(13,8))
+        │       └── body: (length: 1)
+        │           └── @ CallNode (location: (13,5)-(13,8))
+        │               ├── receiver: ∅
+        │               ├── call_operator_loc: ∅
+        │               ├── name: :foo
+        │               ├── message_loc: (13,5)-(13,8) = "foo"
+        │               ├── opening_loc: ∅
+        │               ├── arguments: ∅
+        │               ├── closing_loc: ∅
+        │               ├── block: ∅
+        │               └── flags: variable_call
         ├── @ LambdaNode (location: (15,0)-(15,15))
         │   ├── locals: []
         │   ├── operator_loc: (15,0)-(15,2) = "->"
         │   ├── opening_loc: (15,3)-(15,5) = "do"
         │   ├── closing_loc: (15,12)-(15,15) = "end"
         │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (15,7)-(15,10))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (15,7)-(15,10))
-        │   │           ├── receiver: ∅
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :foo
-        │   │           ├── message_loc: (15,7)-(15,10) = "foo"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           ├── block: ∅
-        │   │           └── flags: variable_call
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (15,7)-(15,10))
+        │       └── body: (length: 1)
+        │           └── @ CallNode (location: (15,7)-(15,10))
+        │               ├── receiver: ∅
+        │               ├── call_operator_loc: ∅
+        │               ├── name: :foo
+        │               ├── message_loc: (15,7)-(15,10) = "foo"
+        │               ├── opening_loc: ∅
+        │               ├── arguments: ∅
+        │               ├── closing_loc: ∅
+        │               ├── block: ∅
+        │               └── flags: variable_call
         ├── @ LambdaNode (location: (17,0)-(17,29))
         │   ├── locals: [:a, :b, :c, :d, :e]
         │   ├── operator_loc: (17,0)-(17,2) = "->"
@@ -164,13 +159,12 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (17,26)-(17,27))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (17,26)-(17,27))
-        │   │           ├── name: :a
-        │   │           └── depth: 0
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (17,26)-(17,27))
+        │       └── body: (length: 1)
+        │           └── @ LocalVariableReadNode (location: (17,26)-(17,27))
+        │               ├── name: :a
+        │               └── depth: 0
         ├── @ LambdaNode (location: (19,0)-(19,40))
         │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
         │   ├── operator_loc: (19,0)-(19,2) = "->"
@@ -217,13 +211,12 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (19,3)-(19,4) = "("
         │   │   └── closing_loc: (19,33)-(19,34) = ")"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (19,37)-(19,38))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (19,37)-(19,38))
-        │   │           ├── name: :a
-        │   │           └── depth: 0
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (19,37)-(19,38))
+        │       └── body: (length: 1)
+        │           └── @ LocalVariableReadNode (location: (19,37)-(19,38))
+        │               ├── name: :a
+        │               └── depth: 0
         ├── @ LambdaNode (location: (21,0)-(23,3))
         │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
         │   ├── operator_loc: (21,0)-(21,2) = "->"
@@ -270,13 +263,12 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (21,3)-(21,4) = "("
         │   │   └── closing_loc: (21,33)-(21,34) = ")"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (22,2)-(22,3))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LocalVariableReadNode (location: (22,2)-(22,3))
-        │   │           ├── name: :a
-        │   │           └── depth: 0
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (22,2)-(22,3))
+        │       └── body: (length: 1)
+        │           └── @ LocalVariableReadNode (location: (22,2)-(22,3))
+        │               ├── name: :a
+        │               └── depth: 0
         ├── @ LambdaNode (location: (25,0)-(25,25))
         │   ├── locals: [:a]
         │   ├── operator_loc: (25,0)-(25,2) = "->"
@@ -298,54 +290,52 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (25,3)-(25,4) = "("
         │   │   └── closing_loc: (25,5)-(25,6) = ")"
-        │   ├── body:
-        │   │   @ StatementsNode (location: (25,9)-(25,23))
-        │   │   └── body: (length: 1)
-        │   │       └── @ LambdaNode (location: (25,9)-(25,23))
-        │   │           ├── locals: [:b]
-        │   │           ├── operator_loc: (25,9)-(25,11) = "->"
-        │   │           ├── opening_loc: (25,14)-(25,15) = "{"
-        │   │           ├── closing_loc: (25,22)-(25,23) = "}"
-        │   │           ├── parameters:
-        │   │           │   @ BlockParametersNode (location: (25,12)-(25,13))
-        │   │           │   ├── parameters:
-        │   │           │   │   @ ParametersNode (location: (25,12)-(25,13))
-        │   │           │   │   ├── requireds: (length: 1)
-        │   │           │   │   │   └── @ RequiredParameterNode (location: (25,12)-(25,13))
-        │   │           │   │   │       └── name: :b
-        │   │           │   │   ├── optionals: (length: 0)
-        │   │           │   │   ├── rest: ∅
-        │   │           │   │   ├── posts: (length: 0)
-        │   │           │   │   ├── keywords: (length: 0)
-        │   │           │   │   ├── keyword_rest: ∅
-        │   │           │   │   └── block: ∅
-        │   │           │   ├── locals: (length: 0)
-        │   │           │   ├── opening_loc: ∅
-        │   │           │   └── closing_loc: ∅
-        │   │           ├── body:
-        │   │           │   @ StatementsNode (location: (25,16)-(25,21))
-        │   │           │   └── body: (length: 1)
-        │   │           │       └── @ CallNode (location: (25,16)-(25,21))
-        │   │           │           ├── receiver:
-        │   │           │           │   @ LocalVariableReadNode (location: (25,16)-(25,17))
-        │   │           │           │   ├── name: :a
-        │   │           │           │   └── depth: 1
-        │   │           │           ├── call_operator_loc: ∅
-        │   │           │           ├── name: :*
-        │   │           │           ├── message_loc: (25,18)-(25,19) = "*"
-        │   │           │           ├── opening_loc: ∅
-        │   │           │           ├── arguments:
-        │   │           │           │   @ ArgumentsNode (location: (25,20)-(25,21))
-        │   │           │           │   ├── arguments: (length: 1)
-        │   │           │           │   │   └── @ LocalVariableReadNode (location: (25,20)-(25,21))
-        │   │           │           │   │       ├── name: :b
-        │   │           │           │   │       └── depth: 0
-        │   │           │           │   └── flags: ∅
-        │   │           │           ├── closing_loc: ∅
-        │   │           │           ├── block: ∅
-        │   │           │           └── flags: ∅
-        │   │           └── numbered_parameters: 0
-        │   └── numbered_parameters: 0
+        │   └── body:
+        │       @ StatementsNode (location: (25,9)-(25,23))
+        │       └── body: (length: 1)
+        │           └── @ LambdaNode (location: (25,9)-(25,23))
+        │               ├── locals: [:b]
+        │               ├── operator_loc: (25,9)-(25,11) = "->"
+        │               ├── opening_loc: (25,14)-(25,15) = "{"
+        │               ├── closing_loc: (25,22)-(25,23) = "}"
+        │               ├── parameters:
+        │               │   @ BlockParametersNode (location: (25,12)-(25,13))
+        │               │   ├── parameters:
+        │               │   │   @ ParametersNode (location: (25,12)-(25,13))
+        │               │   │   ├── requireds: (length: 1)
+        │               │   │   │   └── @ RequiredParameterNode (location: (25,12)-(25,13))
+        │               │   │   │       └── name: :b
+        │               │   │   ├── optionals: (length: 0)
+        │               │   │   ├── rest: ∅
+        │               │   │   ├── posts: (length: 0)
+        │               │   │   ├── keywords: (length: 0)
+        │               │   │   ├── keyword_rest: ∅
+        │               │   │   └── block: ∅
+        │               │   ├── locals: (length: 0)
+        │               │   ├── opening_loc: ∅
+        │               │   └── closing_loc: ∅
+        │               └── body:
+        │                   @ StatementsNode (location: (25,16)-(25,21))
+        │                   └── body: (length: 1)
+        │                       └── @ CallNode (location: (25,16)-(25,21))
+        │                           ├── receiver:
+        │                           │   @ LocalVariableReadNode (location: (25,16)-(25,17))
+        │                           │   ├── name: :a
+        │                           │   └── depth: 1
+        │                           ├── call_operator_loc: ∅
+        │                           ├── name: :*
+        │                           ├── message_loc: (25,18)-(25,19) = "*"
+        │                           ├── opening_loc: ∅
+        │                           ├── arguments:
+        │                           │   @ ArgumentsNode (location: (25,20)-(25,21))
+        │                           │   ├── arguments: (length: 1)
+        │                           │   │   └── @ LocalVariableReadNode (location: (25,20)-(25,21))
+        │                           │   │       ├── name: :b
+        │                           │   │       └── depth: 0
+        │                           │   └── flags: ∅
+        │                           ├── closing_loc: ∅
+        │                           ├── block: ∅
+        │                           └── flags: ∅
         └── @ LambdaNode (location: (27,0)-(27,19))
             ├── locals: [:a, :b, :c]
             ├── operator_loc: (27,0)-(27,2) = "->"
@@ -379,5 +369,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (27,3)-(27,4) = "("
             │   └── closing_loc: (27,14)-(27,15) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/regex.txt b/test/prism/snapshots/regex.txt
index 2c32ffb4bc..3b6ed09c53 100644
--- a/test/prism/snapshots/regex.txt
+++ b/test/prism/snapshots/regex.txt
@@ -366,6 +366,5 @@
             │   │                   ├── name: :a
             │   │                   └── depth: 1
             │   ├── opening_loc: (40,4)-(40,5) = "{"
-            │   ├── closing_loc: (40,23)-(40,24) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (40,23)-(40,24) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/rescue.txt b/test/prism/snapshots/rescue.txt
index 1bca3164d7..4537d911cf 100644
--- a/test/prism/snapshots/rescue.txt
+++ b/test/prism/snapshots/rescue.txt
@@ -241,8 +241,7 @@
         │   │   │               ├── block: ∅
         │   │   │               └── flags: ∅
         │   │   ├── opening_loc: (18,4)-(18,6) = "do"
-        │   │   ├── closing_loc: (20,0)-(20,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (20,0)-(20,3) = "end"
         │   └── flags: ∅
         ├── @ IfNode (location: (22,0)-(24,3))
         │   ├── if_keyword_loc: (22,0)-(22,2) = "if"
diff --git a/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt b/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt
index 29388b6c52..054e43754a 100644
--- a/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt
@@ -34,6 +34,5 @@
             │   │   └── closing_loc: (1,8)-(1,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,10)-(1,11) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,10)-(1,11) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt b/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
index 8de2bdbb16..2731158862 100644
--- a/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,20)-(1,21) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,20)-(1,21) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt b/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
index 62d23890f4..94b9fa4f01 100644
--- a/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,19)-(1,20) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,19)-(1,20) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt b/test/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
index ac9a37289f..5e362a1019 100644
--- a/test/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_opt_splat_arg_block_omfg.txt
@@ -49,6 +49,5 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,24)-(1,25) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,24)-(1,25) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_optional.txt b/test/prism/snapshots/seattlerb/block_arg_optional.txt
index 069c925a20..f95c7aebaa 100644
--- a/test/prism/snapshots/seattlerb/block_arg_optional.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_optional.txt
@@ -37,6 +37,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_scope.txt b/test/prism/snapshots/seattlerb/block_arg_scope.txt
index 2674541c81..1c060378ca 100644
--- a/test/prism/snapshots/seattlerb/block_arg_scope.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_scope.txt
@@ -34,6 +34,5 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,11)-(1,12) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,12) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_scope2.txt b/test/prism/snapshots/seattlerb/block_arg_scope2.txt
index 4203c79ebc..9d8da491ec 100644
--- a/test/prism/snapshots/seattlerb/block_arg_scope2.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_scope2.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt b/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
index 697637998e..aad8a88607 100644
--- a/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
@@ -38,6 +38,5 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,15)-(1,16) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,15)-(1,16) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_kwargs.txt b/test/prism/snapshots/seattlerb/block_args_kwargs.txt
index 25ba958ed8..484c64bc36 100644
--- a/test/prism/snapshots/seattlerb/block_args_kwargs.txt
+++ b/test/prism/snapshots/seattlerb/block_args_kwargs.txt
@@ -39,6 +39,5 @@
             │   │           ├── name: :kwargs
             │   │           └── depth: 0
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,22)-(1,23) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,22)-(1,23) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt b/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
index 4417158922..bec50cfb2a 100644
--- a/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
+++ b/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
@@ -33,6 +33,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt1.txt b/test/prism/snapshots/seattlerb/block_args_opt1.txt
index 15d8c1d51d..c2cfae78c8 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt1.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt1.txt
@@ -52,6 +52,5 @@
             │   │           ├── closing_loc: (1,21)-(1,22) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,23)-(1,24) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,23)-(1,24) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt2.txt b/test/prism/snapshots/seattlerb/block_args_opt2.txt
index 5695a2351a..1ec66cb9fa 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt2.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt2.txt
@@ -44,6 +44,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt2_2.txt b/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
index 47f096a6d4..e6722c5e65 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
@@ -62,6 +62,5 @@
             │   │           ├── closing_loc: (1,32)-(1,33) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,34)-(1,35) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,34)-(1,35) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt3.txt b/test/prism/snapshots/seattlerb/block_args_opt3.txt
index 1d9e58bb2f..0cdfa0bf8e 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt3.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt3.txt
@@ -69,6 +69,5 @@
             │   │           ├── closing_loc: (1,39)-(1,40) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,41)-(1,42) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,41)-(1,42) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_break.txt b/test/prism/snapshots/seattlerb/block_break.txt
index 9b48681285..9187ab3524 100644
--- a/test/prism/snapshots/seattlerb/block_break.txt
+++ b/test/prism/snapshots/seattlerb/block_break.txt
@@ -49,8 +49,7 @@
             │   │       │   │   └── closing_loc: (1,21)-(1,22) = "|"
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │       │   ├── closing_loc: (1,23)-(1,26) = "end"
-            │   │       │   └── numbered_parameters: 0
+            │   │       │   └── closing_loc: (1,23)-(1,26) = "end"
             │   │       └── flags: ∅
             │   └── flags: ∅
             └── keyword_loc: (1,0)-(1,5) = "break"
diff --git a/test/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt
index 671ab223b9..9a6ac52537 100644
--- a/test/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt
+++ b/test/prism/snapshots/seattlerb/block_call_defn_call_block_call.txt
@@ -75,6 +75,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (4,5)-(4,7) = "do"
-            │   ├── closing_loc: (4,8)-(4,11) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (4,8)-(4,11) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt b/test/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
index 09115a5f07..981b56eed5 100644
--- a/test/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
+++ b/test/prism/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
@@ -54,8 +54,7 @@
             │   │   │           ├── block: ∅
             │   │   │           └── flags: variable_call
             │   │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   │   ├── closing_loc: (1,13)-(1,16) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,13)-(1,16) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,16)-(1,17) = "."
             ├── name: :e
@@ -96,6 +95,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,19)-(1,21) = "do"
-            │   ├── closing_loc: (1,28)-(1,31) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,28)-(1,31) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
index 5e969f3a9b..92a264fff3 100644
--- a/test/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
+++ b/test/prism/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
@@ -54,8 +54,7 @@
             │   │   │           ├── block: ∅
             │   │   │           └── flags: variable_call
             │   │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   │   ├── closing_loc: (1,13)-(1,16) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,13)-(1,16) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,16)-(1,17) = "."
             ├── name: :e
@@ -109,6 +108,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,21)-(1,23) = "do"
-            │   ├── closing_loc: (1,30)-(1,33) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,30)-(1,33) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_call_operation_colon.txt b/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
index 14c06592a2..35029c74c3 100644
--- a/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
+++ b/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
@@ -42,8 +42,7 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,6)-(1,8) = "do"
-            │   │   ├── closing_loc: (1,9)-(1,12) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,9)-(1,12) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,12)-(1,14) = "::"
             ├── name: :d
diff --git a/test/prism/snapshots/seattlerb/block_call_operation_dot.txt b/test/prism/snapshots/seattlerb/block_call_operation_dot.txt
index 3ee42baa1b..85ad62fca7 100644
--- a/test/prism/snapshots/seattlerb/block_call_operation_dot.txt
+++ b/test/prism/snapshots/seattlerb/block_call_operation_dot.txt
@@ -42,8 +42,7 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,6)-(1,8) = "do"
-            │   │   ├── closing_loc: (1,9)-(1,12) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,9)-(1,12) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,12)-(1,13) = "."
             ├── name: :d
diff --git a/test/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt b/test/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt
index b75bc8ee71..08adde5fd8 100644
--- a/test/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt
+++ b/test/prism/snapshots/seattlerb/block_call_paren_call_block_call.txt
@@ -56,6 +56,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   ├── closing_loc: (2,7)-(2,10) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (2,7)-(2,10) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_command_operation_colon.txt b/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
index 0685638b43..5537ba25a7 100644
--- a/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
+++ b/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
@@ -27,8 +27,7 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   │   ├── closing_loc: (1,8)-(1,11) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,8)-(1,11) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,11)-(1,13) = "::"
             ├── name: :c
diff --git a/test/prism/snapshots/seattlerb/block_command_operation_dot.txt b/test/prism/snapshots/seattlerb/block_command_operation_dot.txt
index 1be09de692..13589d2262 100644
--- a/test/prism/snapshots/seattlerb/block_command_operation_dot.txt
+++ b/test/prism/snapshots/seattlerb/block_command_operation_dot.txt
@@ -27,8 +27,7 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   │   ├── closing_loc: (1,8)-(1,11) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (1,8)-(1,11) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (1,11)-(1,12) = "."
             ├── name: :c
diff --git a/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt b/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
index 0fa38bca2d..f50df15dc7 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt b/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
index 01fb9c9795..74a3902c1a 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt b/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
index 4c1a9976bf..caeda850b0 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_decomp_splat.txt b/test/prism/snapshots/seattlerb/block_decomp_splat.txt
index c3f5e7de61..4335b5f4ac 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_splat.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,11)-(1,12) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,12) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kw.txt b/test/prism/snapshots/seattlerb/block_kw.txt
index 9a5bf2b714..1ace3d9389 100644
--- a/test/prism/snapshots/seattlerb/block_kw.txt
+++ b/test/prism/snapshots/seattlerb/block_kw.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   ├── closing_loc: (1,14)-(1,15) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,14)-(1,15) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kw__required.txt b/test/prism/snapshots/seattlerb/block_kw__required.txt
index c7ea062f7f..f1b40925fe 100644
--- a/test/prism/snapshots/seattlerb/block_kw__required.txt
+++ b/test/prism/snapshots/seattlerb/block_kw__required.txt
@@ -33,6 +33,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   ├── closing_loc: (1,13)-(1,16) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,16) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt b/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
index a07f0128fc..ce495a7a7e 100644
--- a/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
+++ b/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
@@ -44,6 +44,5 @@
             │   │           ├── name: :kw
             │   │           └── depth: 0
             │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   ├── closing_loc: (1,19)-(1,20) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,19)-(1,20) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
index 25e2926ca3..3bf3b252f1 100644
--- a/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
+++ b/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
@@ -53,6 +53,5 @@
             │   │           ├── name: :kw
             │   │           └── depth: 0
             │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   ├── closing_loc: (1,32)-(1,33) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,32)-(1,33) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_next.txt b/test/prism/snapshots/seattlerb/block_next.txt
index 8860716914..4fde9c7300 100644
--- a/test/prism/snapshots/seattlerb/block_next.txt
+++ b/test/prism/snapshots/seattlerb/block_next.txt
@@ -49,8 +49,7 @@
             │   │       │   │   └── closing_loc: (1,20)-(1,21) = "|"
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │       │   ├── closing_loc: (1,22)-(1,25) = "end"
-            │   │       │   └── numbered_parameters: 0
+            │   │       │   └── closing_loc: (1,22)-(1,25) = "end"
             │   │       └── flags: ∅
             │   └── flags: ∅
             └── keyword_loc: (1,0)-(1,4) = "next"
diff --git a/test/prism/snapshots/seattlerb/block_opt_arg.txt b/test/prism/snapshots/seattlerb/block_opt_arg.txt
index e2a9218b22..4e3863c1d0 100644
--- a/test/prism/snapshots/seattlerb/block_opt_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_opt_arg.txt
@@ -39,6 +39,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_opt_splat.txt b/test/prism/snapshots/seattlerb/block_opt_splat.txt
index de85831d97..54009f2e0f 100644
--- a/test/prism/snapshots/seattlerb/block_opt_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_opt_splat.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt b/test/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
index 56e9c30d28..a1cccaf42a 100644
--- a/test/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
+++ b/test/prism/snapshots/seattlerb/block_opt_splat_arg_block_omfg.txt
@@ -47,6 +47,5 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,21)-(1,22) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,21)-(1,22) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_optarg.txt b/test/prism/snapshots/seattlerb/block_optarg.txt
index 6a39de0dc9..6a22978ec9 100644
--- a/test/prism/snapshots/seattlerb/block_optarg.txt
+++ b/test/prism/snapshots/seattlerb/block_optarg.txt
@@ -40,6 +40,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_paren_splat.txt b/test/prism/snapshots/seattlerb/block_paren_splat.txt
index 81169108e2..04987521fe 100644
--- a/test/prism/snapshots/seattlerb/block_paren_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_paren_splat.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,14)-(1,15) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,14)-(1,15) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_reg_optarg.txt b/test/prism/snapshots/seattlerb/block_reg_optarg.txt
index b81b299ced..e9ad2f1a6a 100644
--- a/test/prism/snapshots/seattlerb/block_reg_optarg.txt
+++ b/test/prism/snapshots/seattlerb/block_reg_optarg.txt
@@ -42,6 +42,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_return.txt b/test/prism/snapshots/seattlerb/block_return.txt
index c9f9a42f72..858e1a9de4 100644
--- a/test/prism/snapshots/seattlerb/block_return.txt
+++ b/test/prism/snapshots/seattlerb/block_return.txt
@@ -50,7 +50,6 @@
                 │       │   │   └── closing_loc: (1,22)-(1,23) = "|"
                 │       │   ├── body: ∅
                 │       │   ├── opening_loc: (1,15)-(1,17) = "do"
-                │       │   ├── closing_loc: (1,24)-(1,27) = "end"
-                │       │   └── numbered_parameters: 0
+                │       │   └── closing_loc: (1,24)-(1,27) = "end"
                 │       └── flags: ∅
                 └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_scope.txt b/test/prism/snapshots/seattlerb/block_scope.txt
index ef7117bcfd..3a2e23d27f 100644
--- a/test/prism/snapshots/seattlerb/block_scope.txt
+++ b/test/prism/snapshots/seattlerb/block_scope.txt
@@ -24,6 +24,5 @@
             │   │   └── closing_loc: (1,7)-(1,8) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,9)-(1,10) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,9)-(1,10) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_splat_reg.txt b/test/prism/snapshots/seattlerb/block_splat_reg.txt
index e685bd0264..5f7d263def 100644
--- a/test/prism/snapshots/seattlerb/block_splat_reg.txt
+++ b/test/prism/snapshots/seattlerb/block_splat_reg.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug169.txt b/test/prism/snapshots/seattlerb/bug169.txt
index 901792e094..901778c873 100644
--- a/test/prism/snapshots/seattlerb/bug169.txt
+++ b/test/prism/snapshots/seattlerb/bug169.txt
@@ -24,6 +24,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   ├── closing_loc: (1,6)-(1,7) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,6)-(1,7) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug236.txt b/test/prism/snapshots/seattlerb/bug236.txt
index a6ee09e21a..c9009c0bf0 100644
--- a/test/prism/snapshots/seattlerb/bug236.txt
+++ b/test/prism/snapshots/seattlerb/bug236.txt
@@ -33,8 +33,7 @@
         │   │   │   └── closing_loc: (1,5)-(1,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,1)-(1,2) = "{"
-        │   │   ├── closing_loc: (1,6)-(1,7) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,6)-(1,7) = "}"
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,6))
             ├── receiver: ∅
@@ -65,6 +64,5 @@
             │   │   └── closing_loc: (3,4)-(3,5) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (3,1)-(3,2) = "{"
-            │   ├── closing_loc: (3,5)-(3,6) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,5)-(3,6) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_187.txt b/test/prism/snapshots/seattlerb/bug_187.txt
index 5c3fc886d6..83c443c7c2 100644
--- a/test/prism/snapshots/seattlerb/bug_187.txt
+++ b/test/prism/snapshots/seattlerb/bug_187.txt
@@ -44,8 +44,7 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   │       │           │   ├── closing_loc: (2,7)-(2,10) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (2,7)-(2,10) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── locals: []
             │   │       ├── def_keyword_loc: (1,8)-(1,11) = "def"
diff --git a/test/prism/snapshots/seattlerb/bug_249.txt b/test/prism/snapshots/seattlerb/bug_249.txt
index b064cd8817..720c4d16f2 100644
--- a/test/prism/snapshots/seattlerb/bug_249.txt
+++ b/test/prism/snapshots/seattlerb/bug_249.txt
@@ -49,8 +49,7 @@
             │   │   │   │   │           │   │           ├── equal_loc: ∅
             │   │   │   │   │           │   │           └── end_keyword_loc: (3,0)-(3,3) = "end"
             │   │   │   │   │           │   ├── opening_loc: (1,17)-(1,19) = "do"
-            │   │   │   │   │           │   ├── closing_loc: (4,1)-(4,4) = "end"
-            │   │   │   │   │           │   └── numbered_parameters: 0
+            │   │   │   │   │           │   └── closing_loc: (4,1)-(4,4) = "end"
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (1,6)-(1,7) = "("
             │   │   │   │   └── closing_loc: (4,4)-(4,5) = ")"
diff --git a/test/prism/snapshots/seattlerb/bug_args__19.txt b/test/prism/snapshots/seattlerb/bug_args__19.txt
index 56214d6ffc..f4cf106679 100644
--- a/test/prism/snapshots/seattlerb/bug_args__19.txt
+++ b/test/prism/snapshots/seattlerb/bug_args__19.txt
@@ -52,6 +52,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,15)-(1,16) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,15)-(1,16) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_args_masgn.txt b/test/prism/snapshots/seattlerb/bug_args_masgn.txt
index dd79941f72..ba00a0c0e2 100644
--- a/test/prism/snapshots/seattlerb/bug_args_masgn.txt
+++ b/test/prism/snapshots/seattlerb/bug_args_masgn.txt
@@ -42,6 +42,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_args_masgn2.txt b/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
index ce5982c00d..f417b7e040 100644
--- a/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
+++ b/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
@@ -50,6 +50,5 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,21)-(1,22) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,21)-(1,22) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt b/test/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
index 9456c0e95e..8554ec03d0 100644
--- a/test/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
+++ b/test/prism/snapshots/seattlerb/bug_args_masgn_outer_parens__19.txt
@@ -48,6 +48,5 @@
             │   │   └── closing_loc: (1,16)-(1,17) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,18)-(1,19) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,18)-(1,19) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_masgn_right.txt b/test/prism/snapshots/seattlerb/bug_masgn_right.txt
index e9d8d1b945..fba08a0260 100644
--- a/test/prism/snapshots/seattlerb/bug_masgn_right.txt
+++ b/test/prism/snapshots/seattlerb/bug_masgn_right.txt
@@ -42,6 +42,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/call_array_block_call.txt b/test/prism/snapshots/seattlerb/call_array_block_call.txt
index ef78bbe85c..b5705817ac 100644
--- a/test/prism/snapshots/seattlerb/call_array_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_array_block_call.txt
@@ -29,8 +29,7 @@
             │   │       │       │   ├── parameters: ∅
             │   │       │       │   ├── body: ∅
             │   │       │       │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   │       │       │   ├── closing_loc: (1,14)-(1,17) = "end"
-            │   │       │       │   └── numbered_parameters: 0
+            │   │       │       │   └── closing_loc: (1,14)-(1,17) = "end"
             │   │       │       └── flags: ∅
             │   │       ├── opening_loc: (1,2)-(1,3) = "["
             │   │       ├── closing_loc: (1,18)-(1,19) = "]"
diff --git a/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt b/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
index b7bb7427c6..92f98926f6 100644
--- a/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
@@ -25,8 +25,7 @@
             │   │       │       │   ├── locals: (length: 0)
             │   │       │       │   ├── opening_loc: (1,5)-(1,6) = "("
             │   │       │       │   └── closing_loc: (1,6)-(1,7) = ")"
-            │   │       │       ├── body: ∅
-            │   │       │       └── numbered_parameters: 0
+            │   │       │       └── body: ∅
             │   │       ├── opening_loc: (1,2)-(1,3) = "["
             │   │       ├── closing_loc: (1,10)-(1,11) = "]"
             │   │       └── flags: ∅
@@ -38,6 +37,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,12)-(1,14) = "do"
-            │   ├── closing_loc: (2,0)-(2,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (2,0)-(2,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt b/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt
index 0ad9064b0c..ac3bccb3f6 100644
--- a/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt
@@ -41,8 +41,7 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   │       │           │   ├── closing_loc: (2,7)-(2,10) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (2,7)-(2,10) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── rescue_clause: ∅
             │   │       ├── else_clause: ∅
diff --git a/test/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt b/test/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt
index 9ecc0426b2..9d94a45e5d 100644
--- a/test/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt
+++ b/test/prism/snapshots/seattlerb/call_stabby_do_end_with_block.txt
@@ -18,12 +18,11 @@
             │   │       ├── opening_loc: (1,5)-(1,7) = "do"
             │   │       ├── closing_loc: (1,10)-(1,13) = "end"
             │   │       ├── parameters: ∅
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (1,8)-(1,9))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ IntegerNode (location: (1,8)-(1,9))
-            │   │       │           └── flags: decimal
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (1,8)-(1,9))
+            │   │           └── body: (length: 1)
+            │   │               └── @ IntegerNode (location: (1,8)-(1,9))
+            │   │                   └── flags: decimal
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block:
@@ -36,6 +35,5 @@
             │   │       └── @ IntegerNode (location: (1,17)-(1,18))
             │   │           └── flags: decimal
             │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   ├── closing_loc: (1,19)-(1,22) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,19)-(1,22) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt b/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
index 102a451c35..c641ccdeeb 100644
--- a/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
+++ b/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
@@ -18,12 +18,11 @@
             │   │       ├── opening_loc: (1,5)-(1,6) = "{"
             │   │       ├── closing_loc: (1,9)-(1,10) = "}"
             │   │       ├── parameters: ∅
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (1,7)-(1,8))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ IntegerNode (location: (1,7)-(1,8))
-            │   │       │           └── flags: decimal
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (1,7)-(1,8))
+            │   │           └── body: (length: 1)
+            │   │               └── @ IntegerNode (location: (1,7)-(1,8))
+            │   │                   └── flags: decimal
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block:
@@ -36,6 +35,5 @@
             │   │       └── @ IntegerNode (location: (1,14)-(1,15))
             │   │           └── flags: decimal
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   ├── closing_loc: (1,16)-(1,19) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,19) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/case_in.txt b/test/prism/snapshots/seattlerb/case_in.txt
index 0000aa064d..793448fb7a 100644
--- a/test/prism/snapshots/seattlerb/case_in.txt
+++ b/test/prism/snapshots/seattlerb/case_in.txt
@@ -539,11 +539,10 @@
         │   │       │   │   │   │   ├── locals: (length: 0)
         │   │       │   │   │   │   ├── opening_loc: (70,6)-(70,7) = "("
         │   │       │   │   │   │   └── closing_loc: (70,8)-(70,9) = ")"
-        │   │       │   │   │   ├── body:
-        │   │       │   │   │   │   @ StatementsNode (location: (70,12)-(70,16))
-        │   │       │   │   │   │   └── body: (length: 1)
-        │   │       │   │   │   │       └── @ TrueNode (location: (70,12)-(70,16))
-        │   │       │   │   │   └── numbered_parameters: 0
+        │   │       │   │   │   └── body:
+        │   │       │   │   │       @ StatementsNode (location: (70,12)-(70,16))
+        │   │       │   │   │       └── body: (length: 1)
+        │   │       │   │   │           └── @ TrueNode (location: (70,12)-(70,16))
         │   │       │   │   └── @ LocalVariableTargetNode (location: (70,20)-(70,21))
         │   │       │   │       ├── name: :c
         │   │       │   │       └── depth: 0
diff --git a/test/prism/snapshots/seattlerb/dasgn_icky2.txt b/test/prism/snapshots/seattlerb/dasgn_icky2.txt
index e78ada28c2..34540783fc 100644
--- a/test/prism/snapshots/seattlerb/dasgn_icky2.txt
+++ b/test/prism/snapshots/seattlerb/dasgn_icky2.txt
@@ -57,6 +57,5 @@
             │   │           ├── ensure_clause: ∅
             │   │           └── end_keyword_loc: (7,2)-(7,5) = "end"
             │   ├── opening_loc: (1,2)-(1,4) = "do"
-            │   ├── closing_loc: (8,0)-(8,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (8,0)-(8,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
index baaea40244..118db362cb 100644
--- a/test/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
+++ b/test/prism/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
@@ -45,8 +45,7 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,18)-(1,20) = "do"
-            │   │       │           │   ├── closing_loc: (1,22)-(1,25) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (1,22)-(1,25) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── locals: []
             │   │       ├── def_keyword_loc: (1,2)-(1,5) = "def"
diff --git a/test/prism/snapshots/seattlerb/difficult3_.txt b/test/prism/snapshots/seattlerb/difficult3_.txt
index 8ac226b572..3f2b0545dc 100644
--- a/test/prism/snapshots/seattlerb/difficult3_.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_2.txt b/test/prism/snapshots/seattlerb/difficult3_2.txt
index c415b79b34..1352705188 100644
--- a/test/prism/snapshots/seattlerb/difficult3_2.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_2.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_3.txt b/test/prism/snapshots/seattlerb/difficult3_3.txt
index 13ea75ceea..04207aad7a 100644
--- a/test/prism/snapshots/seattlerb/difficult3_3.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_3.txt
@@ -40,6 +40,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_5.txt b/test/prism/snapshots/seattlerb/difficult3_5.txt
index 5326e818e5..d446ac88b0 100644
--- a/test/prism/snapshots/seattlerb/difficult3_5.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_5.txt
@@ -23,27 +23,25 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (1,4)-(1,5) = "("
             │   │       │   └── closing_loc: (1,5)-(1,6) = ")"
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (1,9)-(1,17))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ CallNode (location: (1,9)-(1,17))
-            │   │       │           ├── receiver: ∅
-            │   │       │           ├── call_operator_loc: ∅
-            │   │       │           ├── name: :g
-            │   │       │           ├── message_loc: (1,9)-(1,10) = "g"
-            │   │       │           ├── opening_loc: ∅
-            │   │       │           ├── arguments: ∅
-            │   │       │           ├── closing_loc: ∅
-            │   │       │           ├── block:
-            │   │       │           │   @ BlockNode (location: (1,11)-(1,17))
-            │   │       │           │   ├── locals: []
-            │   │       │           │   ├── parameters: ∅
-            │   │       │           │   ├── body: ∅
-            │   │       │           │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   │       │           │   ├── closing_loc: (1,14)-(1,17) = "end"
-            │   │       │           │   └── numbered_parameters: 0
-            │   │       │           └── flags: ∅
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (1,9)-(1,17))
+            │   │           └── body: (length: 1)
+            │   │               └── @ CallNode (location: (1,9)-(1,17))
+            │   │                   ├── receiver: ∅
+            │   │                   ├── call_operator_loc: ∅
+            │   │                   ├── name: :g
+            │   │                   ├── message_loc: (1,9)-(1,10) = "g"
+            │   │                   ├── opening_loc: ∅
+            │   │                   ├── arguments: ∅
+            │   │                   ├── closing_loc: ∅
+            │   │                   ├── block:
+            │   │                   │   @ BlockNode (location: (1,11)-(1,17))
+            │   │                   │   ├── locals: []
+            │   │                   │   ├── parameters: ∅
+            │   │                   │   ├── body: ∅
+            │   │                   │   ├── opening_loc: (1,11)-(1,13) = "do"
+            │   │                   │   └── closing_loc: (1,14)-(1,17) = "end"
+            │   │                   └── flags: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__10.txt b/test/prism/snapshots/seattlerb/difficult3__10.txt
index 4bd146e7a3..eabf92f1f4 100644
--- a/test/prism/snapshots/seattlerb/difficult3__10.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__10.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__11.txt b/test/prism/snapshots/seattlerb/difficult3__11.txt
index ab92f6d6ce..16e2bd68b1 100644
--- a/test/prism/snapshots/seattlerb/difficult3__11.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__11.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__12.txt b/test/prism/snapshots/seattlerb/difficult3__12.txt
index 6e96ef63eb..072b3fb130 100644
--- a/test/prism/snapshots/seattlerb/difficult3__12.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__12.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__6.txt b/test/prism/snapshots/seattlerb/difficult3__6.txt
index 09efc1bf6d..2afabb3bb1 100644
--- a/test/prism/snapshots/seattlerb/difficult3__6.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__6.txt
@@ -47,6 +47,5 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,20)-(1,21) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,20)-(1,21) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__7.txt b/test/prism/snapshots/seattlerb/difficult3__7.txt
index ef8732aa5b..c44ed91659 100644
--- a/test/prism/snapshots/seattlerb/difficult3__7.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__7.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__8.txt b/test/prism/snapshots/seattlerb/difficult3__8.txt
index 294530d34a..fe6e57b9e5 100644
--- a/test/prism/snapshots/seattlerb/difficult3__8.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__8.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,19)-(1,20) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,19)-(1,20) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__9.txt b/test/prism/snapshots/seattlerb/difficult3__9.txt
index e05788f406..313eac0f2c 100644
--- a/test/prism/snapshots/seattlerb/difficult3__9.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__9.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,14)-(1,15) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,14)-(1,15) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult6_.txt b/test/prism/snapshots/seattlerb/difficult6_.txt
index fd8b49f94a..3c2c093bad 100644
--- a/test/prism/snapshots/seattlerb/difficult6_.txt
+++ b/test/prism/snapshots/seattlerb/difficult6_.txt
@@ -30,31 +30,30 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,11)-(1,12) = ")"
-            ├── body:
-            │   @ StatementsNode (location: (1,15)-(1,23))
-            │   └── body: (length: 1)
-            │       └── @ CallNode (location: (1,15)-(1,23))
-            │           ├── receiver: ∅
-            │           ├── call_operator_loc: ∅
-            │           ├── name: :p
-            │           ├── message_loc: (1,15)-(1,16) = "p"
-            │           ├── opening_loc: ∅
-            │           ├── arguments:
-            │           │   @ ArgumentsNode (location: (1,17)-(1,23))
-            │           │   ├── arguments: (length: 1)
-            │           │   │   └── @ ArrayNode (location: (1,17)-(1,23))
-            │           │   │       ├── elements: (length: 2)
-            │           │   │       │   ├── @ LocalVariableReadNode (location: (1,18)-(1,19))
-            │           │   │       │   │   ├── name: :a
-            │           │   │       │   │   └── depth: 0
-            │           │   │       │   └── @ LocalVariableReadNode (location: (1,21)-(1,22))
-            │           │   │       │       ├── name: :b
-            │           │   │       │       └── depth: 0
-            │           │   │       ├── opening_loc: (1,17)-(1,18) = "["
-            │           │   │       ├── closing_loc: (1,22)-(1,23) = "]"
-            │           │   │       └── flags: ∅
-            │           │   └── flags: ∅
-            │           ├── closing_loc: ∅
-            │           ├── block: ∅
-            │           └── flags: ∅
-            └── numbered_parameters: 0
+            └── body:
+                @ StatementsNode (location: (1,15)-(1,23))
+                └── body: (length: 1)
+                    └── @ CallNode (location: (1,15)-(1,23))
+                        ├── receiver: ∅
+                        ├── call_operator_loc: ∅
+                        ├── name: :p
+                        ├── message_loc: (1,15)-(1,16) = "p"
+                        ├── opening_loc: ∅
+                        ├── arguments:
+                        │   @ ArgumentsNode (location: (1,17)-(1,23))
+                        │   ├── arguments: (length: 1)
+                        │   │   └── @ ArrayNode (location: (1,17)-(1,23))
+                        │   │       ├── elements: (length: 2)
+                        │   │       │   ├── @ LocalVariableReadNode (location: (1,18)-(1,19))
+                        │   │       │   │   ├── name: :a
+                        │   │       │   │   └── depth: 0
+                        │   │       │   └── @ LocalVariableReadNode (location: (1,21)-(1,22))
+                        │   │       │       ├── name: :b
+                        │   │       │       └── depth: 0
+                        │   │       ├── opening_loc: (1,17)-(1,18) = "["
+                        │   │       ├── closing_loc: (1,22)-(1,23) = "]"
+                        │   │       └── flags: ∅
+                        │   └── flags: ∅
+                        ├── closing_loc: ∅
+                        ├── block: ∅
+                        └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult6__7.txt b/test/prism/snapshots/seattlerb/difficult6__7.txt
index 4a374b95e1..2b8bf58ae0 100644
--- a/test/prism/snapshots/seattlerb/difficult6__7.txt
+++ b/test/prism/snapshots/seattlerb/difficult6__7.txt
@@ -50,6 +50,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,8)-(1,9) = "{"
-            │   ├── closing_loc: (1,10)-(1,11) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,10)-(1,11) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult6__8.txt b/test/prism/snapshots/seattlerb/difficult6__8.txt
index 041e6ca09d..88f0436a72 100644
--- a/test/prism/snapshots/seattlerb/difficult6__8.txt
+++ b/test/prism/snapshots/seattlerb/difficult6__8.txt
@@ -50,6 +50,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   ├── closing_loc: (1,11)-(1,12) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,12) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult7_.txt b/test/prism/snapshots/seattlerb/difficult7_.txt
index 4e41e06c50..5650727fad 100644
--- a/test/prism/snapshots/seattlerb/difficult7_.txt
+++ b/test/prism/snapshots/seattlerb/difficult7_.txt
@@ -75,8 +75,7 @@
             │   │   │   │   │           │   └── end_keyword_loc: ∅
             │   │   │   │   │           └── end_keyword_loc: ∅
             │   │   │   │   ├── opening_loc: (2,18)-(2,19) = "{"
-            │   │   │   │   ├── closing_loc: (2,32)-(2,33) = "}"
-            │   │   │   │   └── numbered_parameters: 0
+            │   │   │   │   └── closing_loc: (2,32)-(2,33) = "}"
             │   │   │   └── flags: ∅
             │   │   └── operator_loc: ∅
             │   └── @ AssocNode (location: (3,8)-(3,14))
diff --git a/test/prism/snapshots/seattlerb/do_bug.txt b/test/prism/snapshots/seattlerb/do_bug.txt
index 245baea629..14c707055f 100644
--- a/test/prism/snapshots/seattlerb/do_bug.txt
+++ b/test/prism/snapshots/seattlerb/do_bug.txt
@@ -57,6 +57,5 @@
             │   │   └── closing_loc: (2,9)-(2,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   ├── closing_loc: (4,0)-(4,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (4,0)-(4,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/do_lambda.txt b/test/prism/snapshots/seattlerb/do_lambda.txt
index 3ef5303475..4713fb3e4b 100644
--- a/test/prism/snapshots/seattlerb/do_lambda.txt
+++ b/test/prism/snapshots/seattlerb/do_lambda.txt
@@ -14,5 +14,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,3)-(1,4) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_1.txt b/test/prism/snapshots/seattlerb/iter_args_1.txt
index 6432062d82..3b0deb9ae6 100644
--- a/test/prism/snapshots/seattlerb/iter_args_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_1.txt
@@ -34,6 +34,5 @@
             │   │   └── closing_loc: (1,8)-(1,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,10)-(1,11) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,10)-(1,11) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_10_1.txt b/test/prism/snapshots/seattlerb/iter_args_10_1.txt
index b27792c9c5..341954af29 100644
--- a/test/prism/snapshots/seattlerb/iter_args_10_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_10_1.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,20)-(1,21) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,20)-(1,21) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_10_2.txt b/test/prism/snapshots/seattlerb/iter_args_10_2.txt
index 245233f4fa..d2bcc55c71 100644
--- a/test/prism/snapshots/seattlerb/iter_args_10_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_10_2.txt
@@ -47,6 +47,5 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,24)-(1,25) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,24)-(1,25) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_11_1.txt b/test/prism/snapshots/seattlerb/iter_args_11_1.txt
index 571169ee9e..d70ee259f2 100644
--- a/test/prism/snapshots/seattlerb/iter_args_11_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_11_1.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,21)-(1,22) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,23)-(1,24) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,23)-(1,24) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_11_2.txt b/test/prism/snapshots/seattlerb/iter_args_11_2.txt
index 2dad442a23..553ad42132 100644
--- a/test/prism/snapshots/seattlerb/iter_args_11_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_11_2.txt
@@ -49,6 +49,5 @@
             │   │   └── closing_loc: (1,25)-(1,26) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,27)-(1,28) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,27)-(1,28) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_2__19.txt b/test/prism/snapshots/seattlerb/iter_args_2__19.txt
index a775d2e425..967df1ac35 100644
--- a/test/prism/snapshots/seattlerb/iter_args_2__19.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_2__19.txt
@@ -40,6 +40,5 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,13)-(1,14) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,13)-(1,14) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_3.txt b/test/prism/snapshots/seattlerb/iter_args_3.txt
index 786e0d72fb..b0570dc8ce 100644
--- a/test/prism/snapshots/seattlerb/iter_args_3.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_3.txt
@@ -44,6 +44,5 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,19)-(1,20) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,19)-(1,20) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_4.txt b/test/prism/snapshots/seattlerb/iter_args_4.txt
index 41238bac4f..9e6822aea2 100644
--- a/test/prism/snapshots/seattlerb/iter_args_4.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_4.txt
@@ -38,6 +38,5 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,15)-(1,16) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,15)-(1,16) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_5.txt b/test/prism/snapshots/seattlerb/iter_args_5.txt
index e0b1400eaf..0af5cda322 100644
--- a/test/prism/snapshots/seattlerb/iter_args_5.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_5.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_6.txt b/test/prism/snapshots/seattlerb/iter_args_6.txt
index 244d99d197..34a6a87559 100644
--- a/test/prism/snapshots/seattlerb/iter_args_6.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_6.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_7_1.txt b/test/prism/snapshots/seattlerb/iter_args_7_1.txt
index cca154572d..cb9521efd1 100644
--- a/test/prism/snapshots/seattlerb/iter_args_7_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_7_1.txt
@@ -41,6 +41,5 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,17)-(1,18) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,17)-(1,18) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_7_2.txt b/test/prism/snapshots/seattlerb/iter_args_7_2.txt
index 42baefab77..dcb74967d9 100644
--- a/test/prism/snapshots/seattlerb/iter_args_7_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_7_2.txt
@@ -45,6 +45,5 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,21)-(1,22) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,21)-(1,22) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_8_1.txt b/test/prism/snapshots/seattlerb/iter_args_8_1.txt
index fe1d1d0885..7f15b98ea9 100644
--- a/test/prism/snapshots/seattlerb/iter_args_8_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_8_1.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,20)-(1,21) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,20)-(1,21) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_8_2.txt b/test/prism/snapshots/seattlerb/iter_args_8_2.txt
index faa9ccd60b..305798bab2 100644
--- a/test/prism/snapshots/seattlerb/iter_args_8_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_8_2.txt
@@ -47,6 +47,5 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,24)-(1,25) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,24)-(1,25) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_9_1.txt b/test/prism/snapshots/seattlerb/iter_args_9_1.txt
index f996e7c796..0f37861d68 100644
--- a/test/prism/snapshots/seattlerb/iter_args_9_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_9_1.txt
@@ -39,6 +39,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_9_2.txt b/test/prism/snapshots/seattlerb/iter_args_9_2.txt
index 9832fb912e..3933c7d1da 100644
--- a/test/prism/snapshots/seattlerb/iter_args_9_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_9_2.txt
@@ -43,6 +43,5 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,20)-(1,21) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,20)-(1,21) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_kwarg.txt b/test/prism/snapshots/seattlerb/iter_kwarg.txt
index dbbc6d6c31..6175f85b7f 100644
--- a/test/prism/snapshots/seattlerb/iter_kwarg.txt
+++ b/test/prism/snapshots/seattlerb/iter_kwarg.txt
@@ -36,6 +36,5 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,11)-(1,12) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,12) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
index 33a5e25bc1..3d197900d1 100644
--- a/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
+++ b/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
@@ -40,6 +40,5 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   ├── closing_loc: (1,16)-(1,17) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,16)-(1,17) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt b/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
index c951864a8a..65048d534d 100644
--- a/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
+++ b/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
@@ -18,8 +18,7 @@
         │   │   │       ├── opening_loc: (1,5)-(1,7) = "do"
         │   │   │       ├── closing_loc: (1,8)-(1,11) = "end"
         │   │   │       ├── parameters: ∅
-        │   │   │       ├── body: ∅
-        │   │   │       └── numbered_parameters: 0
+        │   │   │       └── body: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -39,8 +38,7 @@
         │   │   │       ├── opening_loc: (3,5)-(3,6) = "{"
         │   │   │       ├── closing_loc: (3,6)-(3,7) = "}"
         │   │   │       ├── parameters: ∅
-        │   │   │       ├── body: ∅
-        │   │   │       └── numbered_parameters: 0
+        │   │   │       └── body: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -65,8 +63,7 @@
         │   │   │       │   ├── locals: (length: 0)
         │   │   │       │   ├── opening_loc: (5,4)-(5,5) = "("
         │   │   │       │   └── closing_loc: (5,5)-(5,6) = ")"
-        │   │   │       ├── body: ∅
-        │   │   │       └── numbered_parameters: 0
+        │   │   │       └── body: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -91,8 +88,7 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (7,4)-(7,5) = "("
             │   │       │   └── closing_loc: (7,5)-(7,6) = ")"
-            │   │       ├── body: ∅
-            │   │       └── numbered_parameters: 0
+            │   │       └── body: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt b/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt
index 79fe45763e..2421482f67 100644
--- a/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt
+++ b/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt
@@ -55,6 +55,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,4) = "do"
-            │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,0)-(3,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt b/test/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
index 68611308c6..e582bc2b5f 100644
--- a/test/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
+++ b/test/prism/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
@@ -68,6 +68,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,0)-(3,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt b/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
index 517701bace..ca8f6fd729 100644
--- a/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
+++ b/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
@@ -68,6 +68,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,0)-(3,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/pipe_semicolon.txt b/test/prism/snapshots/seattlerb/pipe_semicolon.txt
index a788b92ab8..1201e87a66 100644
--- a/test/prism/snapshots/seattlerb/pipe_semicolon.txt
+++ b/test/prism/snapshots/seattlerb/pipe_semicolon.txt
@@ -34,6 +34,5 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (1,15)-(1,18) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,15)-(1,18) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/pipe_space.txt b/test/prism/snapshots/seattlerb/pipe_space.txt
index 663377bdce..9ecf022775 100644
--- a/test/prism/snapshots/seattlerb/pipe_space.txt
+++ b/test/prism/snapshots/seattlerb/pipe_space.txt
@@ -32,6 +32,5 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (1,11)-(1,14) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,14) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt b/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
index 5264eee74b..bdd92a5482 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
@@ -44,8 +44,7 @@
             │   │   │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
             │   │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
             │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   │   ├── closing_loc: (5,0)-(5,3) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (5,0)-(5,3) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (5,3)-(5,4) = "."
             ├── name: :call
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt b/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
index be1a23f12b..a137470b71 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
@@ -67,6 +67,5 @@
             │   │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
             │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (9,0)-(9,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (9,0)-(9,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt b/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
index c62a25c804..a7300bda96 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
@@ -47,6 +47,5 @@
             │   │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
             │   │   └── end_keyword_loc: (5,0)-(5,3) = "end"
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (5,0)-(5,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (5,0)-(5,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt b/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
index 2614d426dc..1d192161d7 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
@@ -72,6 +72,5 @@
             │   │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
             │   │   └── end_keyword_loc: (9,0)-(9,3) = "end"
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   ├── closing_loc: (9,0)-(9,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (9,0)-(9,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_in_block.txt b/test/prism/snapshots/seattlerb/rescue_in_block.txt
index 83bf2a7c5d..8864c835b1 100644
--- a/test/prism/snapshots/seattlerb/rescue_in_block.txt
+++ b/test/prism/snapshots/seattlerb/rescue_in_block.txt
@@ -43,6 +43,5 @@
             │   │   ├── ensure_clause: ∅
             │   │   └── end_keyword_loc: (4,0)-(4,3) = "end"
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   ├── closing_loc: (4,0)-(4,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (4,0)-(4,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt b/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
index fcfd205f7c..7392e71525 100644
--- a/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
+++ b/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
@@ -24,5 +24,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt b/test/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
index 64ee528f2c..0661b2a2aa 100644
--- a/test/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
+++ b/test/prism/snapshots/seattlerb/stabby_arg_opt_splat_arg_block_omfg.txt
@@ -41,5 +41,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,20)-(1,21) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt b/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
index d3ab185420..19ea912814 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
@@ -23,37 +23,35 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (1,5)-(1,6) = "("
             │   │       │   └── closing_loc: (1,6)-(1,7) = ")"
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (2,0)-(3,3))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ CallNode (location: (2,0)-(3,3))
-            │   │       │           ├── receiver:
-            │   │       │           │   @ CallNode (location: (2,0)-(2,1))
-            │   │       │           │   ├── receiver: ∅
-            │   │       │           │   ├── call_operator_loc: ∅
-            │   │       │           │   ├── name: :a
-            │   │       │           │   ├── message_loc: (2,0)-(2,1) = "a"
-            │   │       │           │   ├── opening_loc: ∅
-            │   │       │           │   ├── arguments: ∅
-            │   │       │           │   ├── closing_loc: ∅
-            │   │       │           │   ├── block: ∅
-            │   │       │           │   └── flags: variable_call
-            │   │       │           ├── call_operator_loc: (2,1)-(2,2) = "."
-            │   │       │           ├── name: :b
-            │   │       │           ├── message_loc: (2,2)-(2,3) = "b"
-            │   │       │           ├── opening_loc: ∅
-            │   │       │           ├── arguments: ∅
-            │   │       │           ├── closing_loc: ∅
-            │   │       │           ├── block:
-            │   │       │           │   @ BlockNode (location: (2,4)-(3,3))
-            │   │       │           │   ├── locals: []
-            │   │       │           │   ├── parameters: ∅
-            │   │       │           │   ├── body: ∅
-            │   │       │           │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   │       │           │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   │       │           │   └── numbered_parameters: 0
-            │   │       │           └── flags: ∅
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (2,0)-(3,3))
+            │   │           └── body: (length: 1)
+            │   │               └── @ CallNode (location: (2,0)-(3,3))
+            │   │                   ├── receiver:
+            │   │                   │   @ CallNode (location: (2,0)-(2,1))
+            │   │                   │   ├── receiver: ∅
+            │   │                   │   ├── call_operator_loc: ∅
+            │   │                   │   ├── name: :a
+            │   │                   │   ├── message_loc: (2,0)-(2,1) = "a"
+            │   │                   │   ├── opening_loc: ∅
+            │   │                   │   ├── arguments: ∅
+            │   │                   │   ├── closing_loc: ∅
+            │   │                   │   ├── block: ∅
+            │   │                   │   └── flags: variable_call
+            │   │                   ├── call_operator_loc: (2,1)-(2,2) = "."
+            │   │                   ├── name: :b
+            │   │                   ├── message_loc: (2,2)-(2,3) = "b"
+            │   │                   ├── opening_loc: ∅
+            │   │                   ├── arguments: ∅
+            │   │                   ├── closing_loc: ∅
+            │   │                   ├── block:
+            │   │                   │   @ BlockNode (location: (2,4)-(3,3))
+            │   │                   │   ├── locals: []
+            │   │                   │   ├── parameters: ∅
+            │   │                   │   ├── body: ∅
+            │   │                   │   ├── opening_loc: (2,4)-(2,6) = "do"
+            │   │                   │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   │                   └── flags: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt b/test/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
index 976f129fcb..84f7aaebf9 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_iter_call_no_target_with_arg.txt
@@ -23,32 +23,30 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (1,5)-(1,6) = "("
             │   │       │   └── closing_loc: (1,6)-(1,7) = ")"
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (2,0)-(3,3))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ CallNode (location: (2,0)-(3,3))
-            │   │       │           ├── receiver: ∅
-            │   │       │           ├── call_operator_loc: ∅
-            │   │       │           ├── name: :a
-            │   │       │           ├── message_loc: (2,0)-(2,1) = "a"
-            │   │       │           ├── opening_loc: (2,1)-(2,2) = "("
-            │   │       │           ├── arguments:
-            │   │       │           │   @ ArgumentsNode (location: (2,2)-(2,3))
-            │   │       │           │   ├── arguments: (length: 1)
-            │   │       │           │   │   └── @ IntegerNode (location: (2,2)-(2,3))
-            │   │       │           │   │       └── flags: decimal
-            │   │       │           │   └── flags: ∅
-            │   │       │           ├── closing_loc: (2,3)-(2,4) = ")"
-            │   │       │           ├── block:
-            │   │       │           │   @ BlockNode (location: (2,5)-(3,3))
-            │   │       │           │   ├── locals: []
-            │   │       │           │   ├── parameters: ∅
-            │   │       │           │   ├── body: ∅
-            │   │       │           │   ├── opening_loc: (2,5)-(2,7) = "do"
-            │   │       │           │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   │       │           │   └── numbered_parameters: 0
-            │   │       │           └── flags: ∅
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (2,0)-(3,3))
+            │   │           └── body: (length: 1)
+            │   │               └── @ CallNode (location: (2,0)-(3,3))
+            │   │                   ├── receiver: ∅
+            │   │                   ├── call_operator_loc: ∅
+            │   │                   ├── name: :a
+            │   │                   ├── message_loc: (2,0)-(2,1) = "a"
+            │   │                   ├── opening_loc: (2,1)-(2,2) = "("
+            │   │                   ├── arguments:
+            │   │                   │   @ ArgumentsNode (location: (2,2)-(2,3))
+            │   │                   │   ├── arguments: (length: 1)
+            │   │                   │   │   └── @ IntegerNode (location: (2,2)-(2,3))
+            │   │                   │   │       └── flags: decimal
+            │   │                   │   └── flags: ∅
+            │   │                   ├── closing_loc: (2,3)-(2,4) = ")"
+            │   │                   ├── block:
+            │   │                   │   @ BlockNode (location: (2,5)-(3,3))
+            │   │                   │   ├── locals: []
+            │   │                   │   ├── parameters: ∅
+            │   │                   │   ├── body: ∅
+            │   │                   │   ├── opening_loc: (2,5)-(2,7) = "do"
+            │   │                   │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   │                   └── flags: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_block_kw.txt b/test/prism/snapshots/seattlerb/stabby_block_kw.txt
index beed3b76f5..fe95390a27 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_kw.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_kw.txt
@@ -28,5 +28,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,8)-(1,9) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt b/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
index 77ce9defa3..99a2e70586 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
@@ -25,5 +25,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,6)-(1,7) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_proc_scope.txt b/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
index e11a9419fb..059192d67f 100644
--- a/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
+++ b/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
@@ -26,5 +26,4 @@
             │   │       └── name: :b
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,7)-(1,8) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/super.txt b/test/prism/snapshots/super.txt
index 72ed5d8877..55d7526b37 100644
--- a/test/prism/snapshots/super.txt
+++ b/test/prism/snapshots/super.txt
@@ -72,8 +72,7 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (13,6)-(13,7) = "{"
-        │       ├── closing_loc: (13,7)-(13,8) = "}"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (13,7)-(13,8) = "}"
         ├── @ SuperNode (location: (15,0)-(15,17))
         │   ├── keyword_loc: (15,0)-(15,5) = "super"
         │   ├── lparen_loc: (15,5)-(15,6) = "("
@@ -94,8 +93,7 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (15,15)-(15,16) = "{"
-        │       ├── closing_loc: (15,16)-(15,17) = "}"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (15,16)-(15,17) = "}"
         └── @ SuperNode (location: (17,0)-(17,21))
             ├── keyword_loc: (17,0)-(17,5) = "super"
             ├── lparen_loc: (17,5)-(17,6) = "("
diff --git a/test/prism/snapshots/unparser/corpus/literal/block.txt b/test/prism/snapshots/unparser/corpus/literal/block.txt
index 11f92dd01b..82cb3c20e4 100644
--- a/test/prism/snapshots/unparser/corpus/literal/block.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/block.txt
@@ -17,8 +17,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,5) = "{"
-        │   │   ├── closing_loc: (2,0)-(2,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (2,0)-(2,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(4,1))
         │   ├── receiver: ∅
@@ -49,8 +48,7 @@
         │   │   │   └── closing_loc: (3,8)-(3,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,4)-(3,5) = "{"
-        │   │   ├── closing_loc: (4,0)-(4,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (4,0)-(4,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(6,1))
         │   ├── receiver: ∅
@@ -82,8 +80,7 @@
         │   │   │   └── closing_loc: (5,9)-(5,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,4)-(5,5) = "{"
-        │   │   ├── closing_loc: (6,0)-(6,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (6,0)-(6,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(8,1))
         │   ├── receiver: ∅
@@ -117,8 +114,7 @@
         │   │   │   └── closing_loc: (7,12)-(7,13) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,4)-(7,5) = "{"
-        │   │   ├── closing_loc: (8,0)-(8,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (8,0)-(8,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(10,1))
         │   ├── receiver: ∅
@@ -151,8 +147,7 @@
         │   │   │   └── closing_loc: (9,11)-(9,12) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,4)-(9,5) = "{"
-        │   │   ├── closing_loc: (10,0)-(10,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (10,0)-(10,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(13,1))
         │   ├── receiver: ∅
@@ -176,8 +171,7 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (12,2)-(12,5))
         │   │   ├── opening_loc: (11,7)-(11,8) = "{"
-        │   │   ├── closing_loc: (13,0)-(13,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (13,0)-(13,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (14,0)-(16,1))
         │   ├── receiver: ∅
@@ -215,8 +209,7 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (15,2)-(15,5))
         │   │   ├── opening_loc: (14,4)-(14,5) = "{"
-        │   │   ├── closing_loc: (16,0)-(16,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (16,0)-(16,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(19,1))
         │   ├── receiver: ∅
@@ -254,8 +247,7 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (18,2)-(18,5))
         │   │   ├── opening_loc: (17,4)-(17,5) = "{"
-        │   │   ├── closing_loc: (19,0)-(19,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (19,0)-(19,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (20,0)-(22,1))
         │   ├── receiver: ∅
@@ -283,8 +275,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (20,4)-(20,5) = "{"
-        │   │   ├── closing_loc: (22,0)-(22,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (22,0)-(22,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(25,1))
         │   ├── receiver:
@@ -347,8 +338,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (23,8)-(23,9) = "{"
-        │   │   ├── closing_loc: (25,0)-(25,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (25,0)-(25,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (26,0)-(27,1))
         │   ├── receiver:
@@ -393,8 +383,7 @@
         │   │   │   └── closing_loc: (26,16)-(26,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (26,8)-(26,9) = "{"
-        │   │   ├── closing_loc: (27,0)-(27,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (27,0)-(27,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (28,0)-(29,1))
         │   ├── receiver:
@@ -437,8 +426,7 @@
         │   │   │   └── closing_loc: (28,15)-(28,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (28,8)-(28,9) = "{"
-        │   │   ├── closing_loc: (29,0)-(29,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (29,0)-(29,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (30,0)-(31,1))
         │   ├── receiver:
@@ -473,8 +461,7 @@
         │   │   │   └── closing_loc: (30,17)-(30,18) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (30,8)-(30,9) = "{"
-        │   │   ├── closing_loc: (31,0)-(31,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (31,0)-(31,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (32,0)-(34,1))
         │   ├── receiver:
@@ -529,8 +516,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (32,8)-(32,9) = "{"
-        │   │   ├── closing_loc: (34,0)-(34,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (34,0)-(34,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(37,1))
         │   ├── receiver:
@@ -590,8 +576,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (35,8)-(35,9) = "{"
-        │   │   ├── closing_loc: (37,0)-(37,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (37,0)-(37,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (38,0)-(40,1))
         │   ├── receiver:
@@ -657,8 +642,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (38,8)-(38,9) = "{"
-        │   │   ├── closing_loc: (40,0)-(40,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (40,0)-(40,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(43,1))
         │   ├── receiver:
@@ -726,8 +710,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (41,8)-(41,9) = "{"
-        │   │   ├── closing_loc: (43,0)-(43,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (43,0)-(43,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (44,0)-(46,1))
         │   ├── receiver:
@@ -788,8 +771,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (44,8)-(44,9) = "{"
-        │   │   ├── closing_loc: (46,0)-(46,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (46,0)-(46,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (47,0)-(48,5))
         │   ├── receiver:
@@ -817,8 +799,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (47,8)-(47,9) = "{"
-        │   │   │   ├── closing_loc: (48,0)-(48,1) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (48,0)-(48,1) = "}"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (48,1)-(48,2) = "."
         │   ├── name: :baz
@@ -861,8 +842,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (51,0)-(51,3) = "end"
         │   │   ├── opening_loc: (49,2)-(49,4) = "do"
-        │   │   ├── closing_loc: (51,0)-(51,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (51,0)-(51,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (52,0)-(56,3))
         │   ├── receiver: ∅
@@ -914,8 +894,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (56,0)-(56,3) = "end"
         │   │   ├── opening_loc: (52,2)-(52,4) = "do"
-        │   │   ├── closing_loc: (56,0)-(56,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (56,0)-(56,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (57,0)-(61,3))
         │   ├── receiver: ∅
@@ -984,8 +963,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (61,0)-(61,3) = "end"
         │   │   ├── opening_loc: (57,2)-(57,4) = "do"
-        │   │   ├── closing_loc: (61,0)-(61,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (61,0)-(61,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (62,0)-(66,3))
         │   ├── receiver: ∅
@@ -1057,8 +1035,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (66,0)-(66,3) = "end"
         │   │   ├── opening_loc: (62,2)-(62,4) = "do"
-        │   │   ├── closing_loc: (66,0)-(66,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (66,0)-(66,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (67,0)-(71,3))
         │   ├── receiver: ∅
@@ -1125,8 +1102,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (71,0)-(71,3) = "end"
         │   │   ├── opening_loc: (67,2)-(67,4) = "do"
-        │   │   ├── closing_loc: (71,0)-(71,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (71,0)-(71,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (72,0)-(75,3))
         │   ├── receiver: ∅
@@ -1170,8 +1146,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (75,0)-(75,3) = "end"
         │   │   ├── opening_loc: (72,2)-(72,4) = "do"
-        │   │   ├── closing_loc: (75,0)-(75,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (75,0)-(75,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (76,0)-(81,3))
         │   ├── receiver: ∅
@@ -1229,8 +1204,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (81,0)-(81,3) = "end"
         │   │   ├── opening_loc: (76,2)-(76,4) = "do"
-        │   │   ├── closing_loc: (81,0)-(81,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (81,0)-(81,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (82,0)-(86,3))
         │   ├── receiver: ∅
@@ -1300,8 +1274,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (86,0)-(86,3) = "end"
         │   │   ├── opening_loc: (82,2)-(82,4) = "do"
-        │   │   ├── closing_loc: (86,0)-(86,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (86,0)-(86,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (87,0)-(89,3))
         │   ├── receiver: ∅
@@ -1328,8 +1301,7 @@
         │   │   │   │   └── end_keyword_loc: (89,0)-(89,3) = "end"
         │   │   │   └── end_keyword_loc: (89,0)-(89,3) = "end"
         │   │   ├── opening_loc: (87,2)-(87,4) = "do"
-        │   │   ├── closing_loc: (89,0)-(89,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (89,0)-(89,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (90,0)-(93,3))
         │   ├── receiver: ∅
@@ -1363,8 +1335,7 @@
         │   │   │   │   └── end_keyword_loc: (93,0)-(93,3) = "end"
         │   │   │   └── end_keyword_loc: (93,0)-(93,3) = "end"
         │   │   ├── opening_loc: (90,2)-(90,4) = "do"
-        │   │   ├── closing_loc: (93,0)-(93,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (93,0)-(93,3) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (94,0)-(96,1))
             ├── receiver: ∅
@@ -1377,7 +1348,9 @@
             ├── block:
             │   @ BlockNode (location: (94,4)-(96,1))
             │   ├── locals: [:_1, :_2]
-            │   ├── parameters: ∅
+            │   ├── parameters:
+            │   │   @ NumberedParametersNode (location: (94,4)-(96,1))
+            │   │   └── maximum: 2
             │   ├── body:
             │   │   @ StatementsNode (location: (95,2)-(95,9))
             │   │   └── body: (length: 1)
@@ -1401,6 +1374,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (94,4)-(94,5) = "{"
-            │   ├── closing_loc: (96,0)-(96,1) = "}"
-            │   └── numbered_parameters: 2
+            │   └── closing_loc: (96,0)-(96,1) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/defs.txt b/test/prism/snapshots/unparser/corpus/literal/defs.txt
index 0f6a2de064..52cd344710 100644
--- a/test/prism/snapshots/unparser/corpus/literal/defs.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/defs.txt
@@ -141,8 +141,7 @@
         │   │   │   │   │   └── closing_loc: (17,15)-(17,16) = "|"
         │   │   │   │   ├── body: ∅
         │   │   │   │   ├── opening_loc: (17,9)-(17,10) = "{"
-        │   │   │   │   ├── closing_loc: (18,0)-(18,1) = "}"
-        │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   └── closing_loc: (18,0)-(18,1) = "}"
         │   │   │   └── flags: ∅
         │   │   ├── opening_loc: (17,4)-(17,5) = "("
         │   │   └── closing_loc: (18,1)-(18,2) = ")"
diff --git a/test/prism/snapshots/unparser/corpus/literal/dstr.txt b/test/prism/snapshots/unparser/corpus/literal/dstr.txt
index 13c3a74486..33391fe56e 100644
--- a/test/prism/snapshots/unparser/corpus/literal/dstr.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/dstr.txt
@@ -335,6 +335,5 @@
             │   │   └── closing_loc: (34,20)-(34,21) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (34,16)-(34,17) = "{"
-            │   ├── closing_loc: (37,0)-(37,1) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (37,0)-(37,1) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/if.txt b/test/prism/snapshots/unparser/corpus/literal/if.txt
index 97fa18b9d9..4cd56d5a6b 100644
--- a/test/prism/snapshots/unparser/corpus/literal/if.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/if.txt
@@ -254,8 +254,7 @@
             │   │   │           ├── name: :pair
             │   │   │           └── depth: 0
             │   │   ├── opening_loc: (31,7)-(31,8) = "{"
-            │   │   ├── closing_loc: (33,0)-(33,1) = "}"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (33,0)-(33,1) = "}"
             │   └── flags: ∅
             ├── then_keyword_loc: ∅
             ├── statements:
diff --git a/test/prism/snapshots/unparser/corpus/literal/lambda.txt b/test/prism/snapshots/unparser/corpus/literal/lambda.txt
index 130623ef10..a8fb22d80f 100644
--- a/test/prism/snapshots/unparser/corpus/literal/lambda.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/lambda.txt
@@ -17,8 +17,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,7)-(1,8) = "{"
-        │   │   ├── closing_loc: (2,0)-(2,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (2,0)-(2,1) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(5,1))
         │   ├── receiver: ∅
@@ -56,8 +55,7 @@
         │   │   │           ├── name: :a
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (3,7)-(3,8) = "{"
-        │   │   ├── closing_loc: (5,0)-(5,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,0)-(5,1) = "}"
         │   └── flags: ∅
         ├── @ LambdaNode (location: (6,0)-(7,1))
         │   ├── locals: []
@@ -70,8 +68,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (6,2)-(6,3) = "("
         │   │   └── closing_loc: (6,3)-(6,4) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (8,0)-(9,1))
         │   ├── locals: [:a]
         │   ├── operator_loc: (8,0)-(8,2) = "->"
@@ -93,8 +90,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (8,2)-(8,3) = "("
         │   │   └── closing_loc: (8,4)-(8,5) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (10,0)-(11,1))
         │   ├── locals: [:a, :b]
         │   ├── operator_loc: (10,0)-(10,2) = "->"
@@ -118,8 +114,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (10,2)-(10,3) = "("
         │   │   └── closing_loc: (10,7)-(10,8) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ LambdaNode (location: (12,0)-(13,1))
             ├── locals: [:a, :b, :c]
             ├── operator_loc: (12,0)-(12,2) = "->"
@@ -145,5 +140,4 @@
             │   │       └── name: :c
             │   ├── opening_loc: (12,2)-(12,3) = "("
             │   └── closing_loc: (12,10)-(12,11) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/literal.txt b/test/prism/snapshots/unparser/corpus/literal/literal.txt
index b407f23d56..aa36dd7e35 100644
--- a/test/prism/snapshots/unparser/corpus/literal/literal.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/literal.txt
@@ -1081,8 +1081,7 @@
         │   │   │           │       └── unescaped: "\na"
         │   │   │           └── closing_loc: (85,6)-(85,7) = "\""
         │   │   ├── opening_loc: (83,4)-(83,5) = "{"
-        │   │   ├── closing_loc: (86,0)-(86,1) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (86,0)-(86,1) = "}"
         │   └── flags: ∅
         ├── @ SymbolNode (location: (87,0)-(88,2))
         │   ├── opening_loc: (87,0)-(87,2) = ":\""
diff --git a/test/prism/snapshots/unparser/corpus/literal/send.txt b/test/prism/snapshots/unparser/corpus/literal/send.txt
index bdeacaceea..469b3dae4b 100644
--- a/test/prism/snapshots/unparser/corpus/literal/send.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/send.txt
@@ -373,8 +373,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (33,5)-(33,6) = "{"
-        │   │   │   ├── closing_loc: (34,0)-(34,1) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (34,0)-(34,1) = "}"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (34,1)-(34,2) = "."
         │   ├── name: :bar
diff --git a/test/prism/snapshots/unparser/corpus/literal/since/27.txt b/test/prism/snapshots/unparser/corpus/literal/since/27.txt
index 8618dc6e6d..066702897b 100644
--- a/test/prism/snapshots/unparser/corpus/literal/since/27.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/since/27.txt
@@ -8,30 +8,31 @@
         │   ├── operator_loc: (1,0)-(1,2) = "->"
         │   ├── opening_loc: (1,3)-(1,4) = "{"
         │   ├── closing_loc: (3,0)-(3,1) = "}"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (2,2)-(2,9))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (2,2)-(2,9))
-        │   │           ├── receiver:
-        │   │           │   @ LocalVariableReadNode (location: (2,2)-(2,4))
-        │   │           │   ├── name: :_1
-        │   │           │   └── depth: 0
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (2,5)-(2,6) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (2,7)-(2,9))
-        │   │           │   ├── arguments: (length: 1)
-        │   │           │   │   └── @ LocalVariableReadNode (location: (2,7)-(2,9))
-        │   │           │   │       ├── name: :_2
-        │   │           │   │       └── depth: 0
-        │   │           │   └── flags: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           ├── block: ∅
-        │   │           └── flags: ∅
-        │   └── numbered_parameters: 2
+        │   ├── parameters:
+        │   │   @ NumberedParametersNode (location: (1,0)-(3,1))
+        │   │   └── maximum: 2
+        │   └── body:
+        │       @ StatementsNode (location: (2,2)-(2,9))
+        │       └── body: (length: 1)
+        │           └── @ CallNode (location: (2,2)-(2,9))
+        │               ├── receiver:
+        │               │   @ LocalVariableReadNode (location: (2,2)-(2,4))
+        │               │   ├── name: :_1
+        │               │   └── depth: 0
+        │               ├── call_operator_loc: ∅
+        │               ├── name: :+
+        │               ├── message_loc: (2,5)-(2,6) = "+"
+        │               ├── opening_loc: ∅
+        │               ├── arguments:
+        │               │   @ ArgumentsNode (location: (2,7)-(2,9))
+        │               │   ├── arguments: (length: 1)
+        │               │   │   └── @ LocalVariableReadNode (location: (2,7)-(2,9))
+        │               │   │       ├── name: :_2
+        │               │   │       └── depth: 0
+        │               │   └── flags: ∅
+        │               ├── closing_loc: ∅
+        │               ├── block: ∅
+        │               └── flags: ∅
         └── @ ParenthesesNode (location: (4,0)-(4,5))
             ├── body:
             │   @ StatementsNode (location: (4,1)-(4,4))
diff --git a/test/prism/snapshots/unparser/corpus/literal/super.txt b/test/prism/snapshots/unparser/corpus/literal/super.txt
index daef89f848..8175d3504a 100644
--- a/test/prism/snapshots/unparser/corpus/literal/super.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/super.txt
@@ -142,8 +142,7 @@
         │   │   │       │   │           ├── block: ∅
         │   │   │       │   │           └── flags: variable_call
         │   │   │       │   ├── opening_loc: (7,8)-(7,9) = "{"
-        │   │   │       │   ├── closing_loc: (9,0)-(9,1) = "}"
-        │   │   │       │   └── numbered_parameters: 0
+        │   │   │       │   └── closing_loc: (9,0)-(9,1) = "}"
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── rparen_loc: (9,1)-(9,2) = ")"
@@ -167,8 +166,7 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (10,6)-(10,7) = "{"
-        │       ├── closing_loc: (12,0)-(12,1) = "}"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (12,0)-(12,1) = "}"
         ├── @ SuperNode (location: (13,0)-(15,1))
         │   ├── keyword_loc: (13,0)-(13,5) = "super"
         │   ├── lparen_loc: (13,5)-(13,6) = "("
@@ -205,8 +203,7 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (13,9)-(13,10) = "{"
-        │       ├── closing_loc: (15,0)-(15,1) = "}"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (15,0)-(15,1) = "}"
         ├── @ SuperNode (location: (16,0)-(18,1))
         │   ├── keyword_loc: (16,0)-(16,5) = "super"
         │   ├── lparen_loc: (16,5)-(16,6) = "("
@@ -230,8 +227,7 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (16,8)-(16,9) = "{"
-        │       ├── closing_loc: (18,0)-(18,1) = "}"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (18,0)-(18,1) = "}"
         └── @ SuperNode (location: (19,0)-(21,1))
             ├── keyword_loc: (19,0)-(19,5) = "super"
             ├── lparen_loc: (19,5)-(19,6) = "("
@@ -278,5 +274,4 @@
                 │           ├── block: ∅
                 │           └── flags: variable_call
                 ├── opening_loc: (19,12)-(19,13) = "{"
-                ├── closing_loc: (21,0)-(21,1) = "}"
-                └── numbered_parameters: 0
+                └── closing_loc: (21,0)-(21,1) = "}"
diff --git a/test/prism/snapshots/unparser/corpus/literal/while.txt b/test/prism/snapshots/unparser/corpus/literal/while.txt
index 5771e5da39..7bcf111cef 100644
--- a/test/prism/snapshots/unparser/corpus/literal/while.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/while.txt
@@ -70,8 +70,7 @@
         │   │           │   │           │           └── operator_loc: (4,10)-(4,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (2,6)-(2,7) = "{"
-        │   │           │   ├── closing_loc: (6,2)-(6,3) = "}"
-        │   │           │   └── numbered_parameters: 0
+        │   │           │   └── closing_loc: (6,2)-(6,3) = "}"
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (7,0)-(7,3) = "end"
         │   └── name: :A
@@ -335,8 +334,7 @@
         │   │           │   │           │           └── operator_loc: (30,10)-(30,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (28,7)-(28,8) = "{"
-        │   │           │   ├── closing_loc: (32,2)-(32,3) = "}"
-        │   │           │   └── numbered_parameters: 0
+        │   │           │   └── closing_loc: (32,2)-(32,3) = "}"
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (33,0)-(33,3) = "end"
         │   └── name: :A
@@ -407,8 +405,7 @@
         │   │           │   │           │           └── operator_loc: (38,10)-(38,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (36,7)-(36,8) = "{"
-        │   │           │   ├── closing_loc: (40,2)-(40,3) = "}"
-        │   │           │   └── numbered_parameters: 0
+        │   │           │   └── closing_loc: (40,2)-(40,3) = "}"
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (41,0)-(41,3) = "end"
         │   └── name: :A
@@ -632,8 +629,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (61,11)-(61,12) = "{"
-        │   │   │           │   ├── closing_loc: (62,0)-(62,1) = "}"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (62,0)-(62,1) = "}"
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (61,6)-(61,7) = "("
         │   │   └── closing_loc: (62,1)-(62,2) = ")"
@@ -686,8 +682,7 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (70,11)-(70,12) = "{"
-            │   │           │   ├── closing_loc: (71,0)-(71,1) = "}"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (71,0)-(71,1) = "}"
             │   │           └── flags: ∅
             │   ├── opening_loc: (70,6)-(70,7) = "("
             │   └── closing_loc: (71,1)-(71,2) = ")"
diff --git a/test/prism/snapshots/unparser/corpus/semantic/block.txt b/test/prism/snapshots/unparser/corpus/semantic/block.txt
index c3ac1f85c6..f3d5440a59 100644
--- a/test/prism/snapshots/unparser/corpus/semantic/block.txt
+++ b/test/prism/snapshots/unparser/corpus/semantic/block.txt
@@ -17,8 +17,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,6) = "do"
-        │   │   ├── closing_loc: (2,0)-(2,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (2,0)-(2,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (4,0)-(6,3))
         │   ├── receiver: ∅
@@ -48,8 +47,7 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (6,0)-(6,3) = "end"
         │   │   ├── opening_loc: (4,4)-(4,6) = "do"
-        │   │   ├── closing_loc: (6,0)-(6,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (6,0)-(6,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (8,0)-(11,3))
         │   ├── receiver: ∅
@@ -74,8 +72,7 @@
         │   │   │       │       @ NilNode (location: (9,13)-(9,16))
         │   │   │       └── @ NilNode (location: (10,2)-(10,5))
         │   │   ├── opening_loc: (8,4)-(8,6) = "do"
-        │   │   ├── closing_loc: (11,0)-(11,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (11,0)-(11,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(14,3))
         │   ├── receiver: ∅
@@ -106,8 +103,7 @@
         │   │   │   └── closing_loc: (13,9)-(13,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,4)-(13,6) = "do"
-        │   │   ├── closing_loc: (14,0)-(14,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (14,0)-(14,3) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (16,0)-(20,3))
         │   ├── receiver: ∅
@@ -152,8 +148,7 @@
         │   │   │           ├── name: :a
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (16,12)-(16,14) = "do"
-        │   │   ├── closing_loc: (20,0)-(20,3) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (20,0)-(20,3) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (22,0)-(26,3))
             ├── receiver: ∅
@@ -190,6 +185,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (22,12)-(22,14) = "do"
-            │   ├── closing_loc: (26,0)-(26,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (26,0)-(26,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/semantic/while.txt b/test/prism/snapshots/unparser/corpus/semantic/while.txt
index 6d79ccfeda..6339a0208a 100644
--- a/test/prism/snapshots/unparser/corpus/semantic/while.txt
+++ b/test/prism/snapshots/unparser/corpus/semantic/while.txt
@@ -21,8 +21,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (1,11)-(1,12) = "{"
-        │   │   │   ├── closing_loc: (1,12)-(1,13) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (1,12)-(1,13) = "}"
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (1,0)-(1,1))
@@ -56,8 +55,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (3,9)-(3,10) = "{"
-        │   │   │   ├── closing_loc: (3,10)-(3,11) = "}"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (3,10)-(3,11) = "}"
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (4,2)-(4,3))
@@ -131,8 +129,7 @@
         │   │   │   │   ├── parameters: ∅
         │   │   │   │   ├── body: ∅
         │   │   │   │   ├── opening_loc: (9,15)-(9,16) = "{"
-        │   │   │   │   ├── closing_loc: (9,17)-(9,18) = "}"
-        │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   └── closing_loc: (9,17)-(9,18) = "}"
         │   │   │   └── flags: ∅
         │   │   └── operator_loc: (9,10)-(9,12) = "&&"
         │   ├── statements:
@@ -215,8 +212,7 @@
         │   │   │   │           ├── block: ∅
         │   │   │   │           └── flags: variable_call
         │   │   │   ├── opening_loc: (15,18)-(15,20) = "do"
-        │   │   │   ├── closing_loc: (18,0)-(18,3) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (18,0)-(18,3) = "end"
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (15,0)-(15,1))
diff --git a/test/prism/snapshots/while.txt b/test/prism/snapshots/while.txt
index 8b547fee88..3d74f777b6 100644
--- a/test/prism/snapshots/while.txt
+++ b/test/prism/snapshots/while.txt
@@ -134,8 +134,7 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (13,27)-(13,29) = "do"
-        │   │   │   │           │   ├── closing_loc: (13,30)-(13,33) = "end"
-        │   │   │   │           │   └── numbered_parameters: 0
+        │   │   │   │           │   └── closing_loc: (13,30)-(13,33) = "end"
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -191,8 +190,7 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (15,24)-(15,26) = "do"
-        │   │   │           │   │   ├── closing_loc: (15,27)-(15,30) = "end"
-        │   │   │           │   │   └── numbered_parameters: 0
+        │   │   │           │   │   └── closing_loc: (15,27)-(15,30) = "end"
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (15,18)-(15,19) = "="
         │   │   ├── end_keyword_loc: (15,32)-(15,35) = "end"
@@ -231,8 +229,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (17,25)-(17,27) = "do"
-        │   │   │           │   ├── closing_loc: (17,28)-(17,31) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (17,28)-(17,31) = "end"
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: (17,33)-(17,36) = "end"
         │   ├── statements:
@@ -274,8 +271,7 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (19,29)-(19,31) = "do"
-        │   │   │           │   │   ├── closing_loc: (19,32)-(19,35) = "end"
-        │   │   │           │   │   └── numbered_parameters: 0
+        │   │   │           │   │   └── closing_loc: (19,32)-(19,35) = "end"
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (19,23)-(19,24) = "="
         │   │   └── end_keyword_loc: (19,37)-(19,40) = "end"
@@ -312,8 +308,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (21,20)-(21,22) = "do"
-        │   │   │           │   ├── closing_loc: (21,23)-(21,26) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (21,23)-(21,26) = "end"
         │   │   │           └── flags: ∅
         │   │   ├── locals: []
         │   │   ├── def_keyword_loc: (21,6)-(21,9) = "def"
diff --git a/test/prism/snapshots/whitequark/arg_label.txt b/test/prism/snapshots/whitequark/arg_label.txt
index 62125b7f2d..1f04f6d5f1 100644
--- a/test/prism/snapshots/whitequark/arg_label.txt
+++ b/test/prism/snapshots/whitequark/arg_label.txt
@@ -108,6 +108,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (6,2)-(6,3) = "{"
-            │   ├── closing_loc: (6,11)-(6,12) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (6,11)-(6,12) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/arg_scope.txt b/test/prism/snapshots/whitequark/arg_scope.txt
index 9aba1c6de1..cb08a16a4c 100644
--- a/test/prism/snapshots/whitequark/arg_scope.txt
+++ b/test/prism/snapshots/whitequark/arg_scope.txt
@@ -29,6 +29,5 @@
             │   │           ├── name: :a
             │   │           └── depth: 0
             │   ├── opening_loc: (1,6)-(1,7) = "{"
-            │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/begin_cmdarg.txt b/test/prism/snapshots/whitequark/begin_cmdarg.txt
index cf7d41b085..696be9e2f8 100644
--- a/test/prism/snapshots/whitequark/begin_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/begin_cmdarg.txt
@@ -37,8 +37,7 @@
             │   │       │           │   │       └── @ IntegerNode (location: (1,19)-(1,20))
             │   │       │           │   │           └── flags: decimal
             │   │       │           │   ├── opening_loc: (1,16)-(1,18) = "do"
-            │   │       │           │   ├── closing_loc: (1,21)-(1,24) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (1,21)-(1,24) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── rescue_clause: ∅
             │   │       ├── else_clause: ∅
diff --git a/test/prism/snapshots/whitequark/blockargs.txt b/test/prism/snapshots/whitequark/blockargs.txt
index 9e579bee86..73f8278918 100644
--- a/test/prism/snapshots/whitequark/blockargs.txt
+++ b/test/prism/snapshots/whitequark/blockargs.txt
@@ -17,8 +17,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,1)-(1,2) = "{"
-        │   │   ├── closing_loc: (1,4)-(1,5) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,4)-(1,5) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,8))
         │   ├── receiver: ∅
@@ -39,8 +38,7 @@
         │   │   │   └── closing_loc: (3,5)-(3,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,1)-(3,2) = "{"
-        │   │   ├── closing_loc: (3,7)-(3,8) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,7)-(3,8) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,9))
         │   ├── receiver: ∅
@@ -73,8 +71,7 @@
         │   │   │   └── closing_loc: (5,6)-(5,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,1)-(5,2) = "{"
-        │   │   ├── closing_loc: (5,8)-(5,9) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,8)-(5,9) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,16))
         │   ├── receiver: ∅
@@ -111,8 +108,7 @@
         │   │   │   └── closing_loc: (7,13)-(7,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,1)-(7,2) = "{"
-        │   │   ├── closing_loc: (7,15)-(7,16) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (7,15)-(7,16) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,12))
         │   ├── receiver: ∅
@@ -149,8 +145,7 @@
         │   │   │   └── closing_loc: (9,9)-(9,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,1)-(9,2) = "{"
-        │   │   ├── closing_loc: (9,11)-(9,12) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (9,11)-(9,12) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,16))
         │   ├── receiver: ∅
@@ -189,8 +184,7 @@
         │   │   │   └── closing_loc: (11,13)-(11,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,1)-(11,2) = "{"
-        │   │   ├── closing_loc: (11,15)-(11,16) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (11,15)-(11,16) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,13))
         │   ├── receiver: ∅
@@ -227,8 +221,7 @@
         │   │   │   └── closing_loc: (13,10)-(13,11) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,1)-(13,2) = "{"
-        │   │   ├── closing_loc: (13,12)-(13,13) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (13,12)-(13,13) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,9))
         │   ├── receiver: ∅
@@ -261,8 +254,7 @@
         │   │   │   └── closing_loc: (15,6)-(15,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,1)-(15,2) = "{"
-        │   │   ├── closing_loc: (15,8)-(15,9) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (15,8)-(15,9) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,8))
         │   ├── receiver: ∅
@@ -295,8 +287,7 @@
         │   │   │   └── closing_loc: (17,5)-(17,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,1)-(17,2) = "{"
-        │   │   ├── closing_loc: (17,7)-(17,8) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (17,7)-(17,8) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(21,3))
         │   ├── receiver: ∅
@@ -319,8 +310,7 @@
         │   │   │   └── closing_loc: (21,0)-(21,1) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,1)-(19,2) = "{"
-        │   │   ├── closing_loc: (21,2)-(21,3) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (21,2)-(21,3) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(23,9))
         │   ├── receiver: ∅
@@ -343,8 +333,7 @@
         │   │   │   └── closing_loc: (23,6)-(23,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (23,1)-(23,2) = "{"
-        │   │   ├── closing_loc: (23,8)-(23,9) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (23,8)-(23,9) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (25,0)-(25,12))
         │   ├── receiver: ∅
@@ -379,8 +368,7 @@
         │   │   │   └── closing_loc: (25,9)-(25,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (25,1)-(25,2) = "{"
-        │   │   ├── closing_loc: (25,11)-(25,12) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (25,11)-(25,12) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (27,0)-(27,15))
         │   ├── receiver: ∅
@@ -419,8 +407,7 @@
         │   │   │   └── closing_loc: (27,12)-(27,13) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (27,1)-(27,2) = "{"
-        │   │   ├── closing_loc: (27,14)-(27,15) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (27,14)-(27,15) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (29,0)-(29,19))
         │   ├── receiver: ∅
@@ -461,8 +448,7 @@
         │   │   │   └── closing_loc: (29,16)-(29,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (29,1)-(29,2) = "{"
-        │   │   ├── closing_loc: (29,18)-(29,19) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (29,18)-(29,19) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,16))
         │   ├── receiver: ∅
@@ -501,8 +487,7 @@
         │   │   │   └── closing_loc: (31,13)-(31,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (31,1)-(31,2) = "{"
-        │   │   ├── closing_loc: (31,15)-(31,16) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (31,15)-(31,16) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,12))
         │   ├── receiver: ∅
@@ -537,8 +522,7 @@
         │   │   │   └── closing_loc: (33,9)-(33,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (33,1)-(33,2) = "{"
-        │   │   ├── closing_loc: (33,11)-(33,12) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (33,11)-(33,12) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,11))
         │   ├── receiver: ∅
@@ -573,8 +557,7 @@
         │   │   │   └── closing_loc: (35,8)-(35,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,1)-(35,2) = "{"
-        │   │   ├── closing_loc: (35,10)-(35,11) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (35,10)-(35,11) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (37,0)-(37,12))
         │   ├── receiver: ∅
@@ -608,8 +591,7 @@
         │   │   │   └── closing_loc: (37,9)-(37,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (37,1)-(37,2) = "{"
-        │   │   ├── closing_loc: (37,11)-(37,12) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (37,11)-(37,12) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (39,0)-(39,11))
         │   ├── receiver: ∅
@@ -642,8 +624,7 @@
         │   │   │   └── closing_loc: (39,8)-(39,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (39,1)-(39,2) = "{"
-        │   │   ├── closing_loc: (39,10)-(39,11) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (39,10)-(39,11) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(41,17))
         │   ├── receiver: ∅
@@ -685,8 +666,7 @@
         │   │   │   └── closing_loc: (41,14)-(41,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (41,1)-(41,2) = "{"
-        │   │   ├── closing_loc: (41,16)-(41,17) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (41,16)-(41,17) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (43,0)-(43,24))
         │   ├── receiver: ∅
@@ -734,8 +714,7 @@
         │   │   │   └── closing_loc: (43,21)-(43,22) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (43,1)-(43,2) = "{"
-        │   │   ├── closing_loc: (43,23)-(43,24) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (43,23)-(43,24) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (45,0)-(45,27))
         │   ├── receiver: ∅
@@ -788,8 +767,7 @@
         │   │   │   └── closing_loc: (45,24)-(45,25) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (45,1)-(45,2) = "{"
-        │   │   ├── closing_loc: (45,26)-(45,27) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (45,26)-(45,27) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (47,0)-(47,20))
         │   ├── receiver: ∅
@@ -833,8 +811,7 @@
         │   │   │   └── closing_loc: (47,17)-(47,18) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (47,1)-(47,2) = "{"
-        │   │   ├── closing_loc: (47,19)-(47,20) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (47,19)-(47,20) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (49,0)-(49,9))
         │   ├── receiver: ∅
@@ -866,8 +843,7 @@
         │   │   │   └── closing_loc: (49,6)-(49,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (49,1)-(49,2) = "{"
-        │   │   ├── closing_loc: (49,8)-(49,9) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (49,8)-(49,9) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (51,0)-(51,8))
         │   ├── receiver: ∅
@@ -898,8 +874,7 @@
         │   │   │   └── closing_loc: (51,5)-(51,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (51,1)-(51,2) = "{"
-        │   │   ├── closing_loc: (51,7)-(51,8) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (51,7)-(51,8) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (53,0)-(53,8))
         │   ├── receiver: ∅
@@ -930,8 +905,7 @@
         │   │   │   └── closing_loc: (53,5)-(53,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (53,1)-(53,2) = "{"
-        │   │   ├── closing_loc: (53,7)-(53,8) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (53,7)-(53,8) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (55,0)-(55,8))
         │   ├── receiver: ∅
@@ -962,8 +936,7 @@
         │   │   │   └── closing_loc: (55,5)-(55,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (55,1)-(55,2) = "{"
-        │   │   ├── closing_loc: (55,7)-(55,8) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (55,7)-(55,8) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (57,0)-(57,17))
         │   ├── receiver: ∅
@@ -1002,8 +975,7 @@
         │   │   │   └── closing_loc: (57,14)-(57,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (57,1)-(57,2) = "{"
-        │   │   ├── closing_loc: (57,16)-(57,17) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (57,16)-(57,17) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (59,0)-(59,32))
         │   ├── receiver: ∅
@@ -1052,8 +1024,7 @@
         │   │   │   └── closing_loc: (59,29)-(59,30) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (59,1)-(59,2) = "{"
-        │   │   ├── closing_loc: (59,31)-(59,32) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (59,31)-(59,32) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (61,0)-(61,11))
         │   ├── receiver: ∅
@@ -1085,8 +1056,7 @@
         │   │   │   └── closing_loc: (61,8)-(61,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (61,1)-(61,2) = "{"
-        │   │   ├── closing_loc: (61,10)-(61,11) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (61,10)-(61,11) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (63,0)-(63,14))
         │   ├── receiver: ∅
@@ -1126,8 +1096,7 @@
         │   │   │   └── closing_loc: (63,11)-(63,12) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (63,1)-(63,2) = "{"
-        │   │   ├── closing_loc: (63,13)-(63,14) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (63,13)-(63,14) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (65,0)-(65,18))
         │   ├── receiver: ∅
@@ -1171,8 +1140,7 @@
         │   │   │   └── closing_loc: (65,15)-(65,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (65,1)-(65,2) = "{"
-        │   │   ├── closing_loc: (65,17)-(65,18) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (65,17)-(65,18) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (67,0)-(67,21))
         │   ├── receiver: ∅
@@ -1218,8 +1186,7 @@
         │   │   │   └── closing_loc: (67,18)-(67,19) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (67,1)-(67,2) = "{"
-        │   │   ├── closing_loc: (67,20)-(67,21) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (67,20)-(67,21) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (69,0)-(69,17))
         │   ├── receiver: ∅
@@ -1261,8 +1228,7 @@
         │   │   │   └── closing_loc: (69,14)-(69,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (69,1)-(69,2) = "{"
-        │   │   ├── closing_loc: (69,16)-(69,17) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (69,16)-(69,17) = "}"
         │   └── flags: ∅
         └── @ CallNode (location: (71,0)-(71,7))
             ├── receiver: ∅
@@ -1283,6 +1249,5 @@
             │   │   └── closing_loc: (71,4)-(71,5) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (71,1)-(71,2) = "{"
-            │   ├── closing_loc: (71,6)-(71,7) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (71,6)-(71,7) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/break_block.txt b/test/prism/snapshots/whitequark/break_block.txt
index 7c9bc9ffb5..d6d6347eda 100644
--- a/test/prism/snapshots/whitequark/break_block.txt
+++ b/test/prism/snapshots/whitequark/break_block.txt
@@ -34,8 +34,7 @@
             │   │       │   ├── parameters: ∅
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │       │   ├── closing_loc: (1,17)-(1,20) = "end"
-            │   │       │   └── numbered_parameters: 0
+            │   │       │   └── closing_loc: (1,17)-(1,20) = "end"
             │   │       └── flags: ∅
             │   └── flags: ∅
             └── keyword_loc: (1,0)-(1,5) = "break"
diff --git a/test/prism/snapshots/whitequark/bug_435.txt b/test/prism/snapshots/whitequark/bug_435.txt
index bba6eb68ea..fd7380e15d 100644
--- a/test/prism/snapshots/whitequark/bug_435.txt
+++ b/test/prism/snapshots/whitequark/bug_435.txt
@@ -32,7 +32,6 @@
             │       │           │   ├── locals: (length: 0)
             │       │           │   ├── opening_loc: ∅
             │       │           │   └── closing_loc: ∅
-            │       │           ├── body: ∅
-            │       │           └── numbered_parameters: 0
+            │       │           └── body: ∅
             │       └── closing_loc: (1,12)-(1,13) = "}"
             └── closing_loc: (1,13)-(1,14) = "\""
diff --git a/test/prism/snapshots/whitequark/bug_447.txt b/test/prism/snapshots/whitequark/bug_447.txt
index 2a6f1f1cb2..a056bd2ce3 100644
--- a/test/prism/snapshots/whitequark/bug_447.txt
+++ b/test/prism/snapshots/whitequark/bug_447.txt
@@ -25,8 +25,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-        │   │   ├── closing_loc: (1,8)-(1,11) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,8)-(1,11) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,14))
             ├── receiver: ∅
@@ -52,6 +51,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (3,8)-(3,10) = "do"
-            │   ├── closing_loc: (3,11)-(3,14) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,11)-(3,14) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_452.txt b/test/prism/snapshots/whitequark/bug_452.txt
index b5969ac2f0..435181b643 100644
--- a/test/prism/snapshots/whitequark/bug_452.txt
+++ b/test/prism/snapshots/whitequark/bug_452.txt
@@ -58,6 +58,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,30)-(1,32) = "do"
-            │   ├── closing_loc: (1,34)-(1,37) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,34)-(1,37) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_466.txt b/test/prism/snapshots/whitequark/bug_466.txt
index 2823887dc8..2b4af5d72c 100644
--- a/test/prism/snapshots/whitequark/bug_466.txt
+++ b/test/prism/snapshots/whitequark/bug_466.txt
@@ -63,6 +63,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,20)-(1,22) = "do"
-            │   ├── closing_loc: (1,24)-(1,27) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,24)-(1,27) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_481.txt b/test/prism/snapshots/whitequark/bug_481.txt
index da7f527e3f..dbd7de7a0c 100644
--- a/test/prism/snapshots/whitequark/bug_481.txt
+++ b/test/prism/snapshots/whitequark/bug_481.txt
@@ -45,6 +45,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,22)-(1,24) = "do"
-            │   ├── closing_loc: (1,25)-(1,28) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,25)-(1,28) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt b/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
index a1873ad116..94c39e2021 100644
--- a/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
+++ b/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
@@ -26,6 +26,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   ├── closing_loc: (1,14)-(1,17) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,14)-(1,17) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_cmdarg.txt b/test/prism/snapshots/whitequark/bug_cmdarg.txt
index e1023d93c1..93eafdb3a3 100644
--- a/test/prism/snapshots/whitequark/bug_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/bug_cmdarg.txt
@@ -76,27 +76,25 @@
             │   │               │   ├── opening_loc: (5,8)-(5,10) = "do"
             │   │               │   ├── closing_loc: (5,23)-(5,26) = "end"
             │   │               │   ├── parameters: ∅
-            │   │               │   ├── body:
-            │   │               │   │   @ StatementsNode (location: (5,11)-(5,22))
-            │   │               │   │   └── body: (length: 1)
-            │   │               │   │       └── @ CallNode (location: (5,11)-(5,22))
-            │   │               │   │           ├── receiver: ∅
-            │   │               │   │           ├── call_operator_loc: ∅
-            │   │               │   │           ├── name: :meth
-            │   │               │   │           ├── message_loc: (5,11)-(5,15) = "meth"
-            │   │               │   │           ├── opening_loc: ∅
-            │   │               │   │           ├── arguments: ∅
-            │   │               │   │           ├── closing_loc: ∅
-            │   │               │   │           ├── block:
-            │   │               │   │           │   @ BlockNode (location: (5,16)-(5,22))
-            │   │               │   │           │   ├── locals: []
-            │   │               │   │           │   ├── parameters: ∅
-            │   │               │   │           │   ├── body: ∅
-            │   │               │   │           │   ├── opening_loc: (5,16)-(5,18) = "do"
-            │   │               │   │           │   ├── closing_loc: (5,19)-(5,22) = "end"
-            │   │               │   │           │   └── numbered_parameters: 0
-            │   │               │   │           └── flags: ∅
-            │   │               │   └── numbered_parameters: 0
+            │   │               │   └── body:
+            │   │               │       @ StatementsNode (location: (5,11)-(5,22))
+            │   │               │       └── body: (length: 1)
+            │   │               │           └── @ CallNode (location: (5,11)-(5,22))
+            │   │               │               ├── receiver: ∅
+            │   │               │               ├── call_operator_loc: ∅
+            │   │               │               ├── name: :meth
+            │   │               │               ├── message_loc: (5,11)-(5,15) = "meth"
+            │   │               │               ├── opening_loc: ∅
+            │   │               │               ├── arguments: ∅
+            │   │               │               ├── closing_loc: ∅
+            │   │               │               ├── block:
+            │   │               │               │   @ BlockNode (location: (5,16)-(5,22))
+            │   │               │               │   ├── locals: []
+            │   │               │               │   ├── parameters: ∅
+            │   │               │               │   ├── body: ∅
+            │   │               │               │   ├── opening_loc: (5,16)-(5,18) = "do"
+            │   │               │               │   └── closing_loc: (5,19)-(5,22) = "end"
+            │   │               │               └── flags: ∅
             │   │               └── operator_loc: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
diff --git a/test/prism/snapshots/whitequark/bug_do_block_in_call_args.txt b/test/prism/snapshots/whitequark/bug_do_block_in_call_args.txt
index 8731f258c9..65bb6e8668 100644
--- a/test/prism/snapshots/whitequark/bug_do_block_in_call_args.txt
+++ b/test/prism/snapshots/whitequark/bug_do_block_in_call_args.txt
@@ -35,8 +35,7 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,23)-(1,25) = "do"
-            │   │       │           │   ├── closing_loc: (1,26)-(1,29) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (1,26)-(1,29) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── locals: []
             │   │       ├── def_keyword_loc: (1,4)-(1,7) = "def"
diff --git a/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt b/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
index e2be2a966a..42600a495a 100644
--- a/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
@@ -30,8 +30,7 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,10)-(1,12) = "do"
-            │   │       │           │   ├── closing_loc: (1,13)-(1,16) = "end"
-            │   │       │           │   └── numbered_parameters: 0
+            │   │       │           │   └── closing_loc: (1,13)-(1,16) = "end"
             │   │       │           └── flags: ∅
             │   │       ├── opening_loc: (1,4)-(1,5) = "("
             │   │       └── closing_loc: (1,16)-(1,17) = ")"
diff --git a/test/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt b/test/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt
index 43effe5e47..2604e721bc 100644
--- a/test/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt
+++ b/test/prism/snapshots/whitequark/bug_do_block_in_hash_brace.txt
@@ -42,8 +42,7 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (1,19)-(1,21) = "do"
-        │   │   │       │   │   │   │   ├── closing_loc: (1,22)-(1,25) = "end"
-        │   │   │       │   │   │   │   └── numbered_parameters: 0
+        │   │   │       │   │   │   │   └── closing_loc: (1,22)-(1,25) = "end"
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: ∅
         │   │   │       │   └── @ AssocNode (location: (1,27)-(1,41))
@@ -68,8 +67,7 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (1,35)-(1,37) = "do"
-        │   │   │       │       │   │   ├── closing_loc: (1,38)-(1,41) = "end"
-        │   │   │       │       │   │   └── numbered_parameters: 0
+        │   │   │       │       │   │   └── closing_loc: (1,38)-(1,41) = "end"
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (1,41)-(1,42) = "}"
@@ -110,8 +108,7 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (3,17)-(3,19) = "do"
-        │   │   │       │   │   │   │   ├── closing_loc: (3,20)-(3,23) = "end"
-        │   │   │       │   │   │   │   └── numbered_parameters: 0
+        │   │   │       │   │   │   │   └── closing_loc: (3,20)-(3,23) = "end"
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: (3,9)-(3,11) = "**"
         │   │   │       │   └── @ AssocNode (location: (3,25)-(3,39))
@@ -136,8 +133,7 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (3,33)-(3,35) = "do"
-        │   │   │       │       │   │   ├── closing_loc: (3,36)-(3,39) = "end"
-        │   │   │       │       │   │   └── numbered_parameters: 0
+        │   │   │       │       │   │   └── closing_loc: (3,36)-(3,39) = "end"
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (3,39)-(3,40) = "}"
@@ -184,8 +180,7 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (5,20)-(5,22) = "do"
-        │   │   │       │   │   │   │   ├── closing_loc: (5,23)-(5,26) = "end"
-        │   │   │       │   │   │   │   └── numbered_parameters: 0
+        │   │   │       │   │   │   │   └── closing_loc: (5,23)-(5,26) = "end"
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: (5,12)-(5,14) = "=>"
         │   │   │       │   └── @ AssocNode (location: (5,28)-(5,42))
@@ -210,8 +205,7 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (5,36)-(5,38) = "do"
-        │   │   │       │       │   │   ├── closing_loc: (5,39)-(5,42) = "end"
-        │   │   │       │       │   │   └── numbered_parameters: 0
+        │   │   │       │       │   │   └── closing_loc: (5,39)-(5,42) = "end"
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (5,42)-(5,43) = "}"
@@ -258,8 +252,7 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (7,17)-(7,19) = "do"
-        │   │   │       │   │   │   │   ├── closing_loc: (7,20)-(7,23) = "end"
-        │   │   │       │   │   │   │   └── numbered_parameters: 0
+        │   │   │       │   │   │   │   └── closing_loc: (7,20)-(7,23) = "end"
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: ∅
         │   │   │       │   └── @ AssocNode (location: (7,25)-(7,39))
@@ -284,8 +277,7 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (7,33)-(7,35) = "do"
-        │   │   │       │       │   │   ├── closing_loc: (7,36)-(7,39) = "end"
-        │   │   │       │       │   │   └── numbered_parameters: 0
+        │   │   │       │       │   │   └── closing_loc: (7,36)-(7,39) = "end"
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (7,39)-(7,40) = "}"
@@ -326,8 +318,7 @@
             │   │       │   │   │   │   ├── parameters: ∅
             │   │       │   │   │   │   ├── body: ∅
             │   │       │   │   │   │   ├── opening_loc: (9,14)-(9,16) = "do"
-            │   │       │   │   │   │   ├── closing_loc: (9,17)-(9,20) = "end"
-            │   │       │   │   │   │   └── numbered_parameters: 0
+            │   │       │   │   │   │   └── closing_loc: (9,17)-(9,20) = "end"
             │   │       │   │   │   └── flags: ∅
             │   │       │   │   ├── value:
             │   │       │   │   │   @ CallNode (location: (9,24)-(9,35))
@@ -344,8 +335,7 @@
             │   │       │   │   │   │   ├── parameters: ∅
             │   │       │   │   │   │   ├── body: ∅
             │   │       │   │   │   │   ├── opening_loc: (9,29)-(9,31) = "do"
-            │   │       │   │   │   │   ├── closing_loc: (9,32)-(9,35) = "end"
-            │   │       │   │   │   │   └── numbered_parameters: 0
+            │   │       │   │   │   │   └── closing_loc: (9,32)-(9,35) = "end"
             │   │       │   │   │   └── flags: ∅
             │   │       │   │   └── operator_loc: (9,21)-(9,23) = "=>"
             │   │       │   └── @ AssocNode (location: (9,37)-(9,51))
@@ -370,8 +360,7 @@
             │   │       │       │   │   ├── parameters: ∅
             │   │       │       │   │   ├── body: ∅
             │   │       │       │   │   ├── opening_loc: (9,45)-(9,47) = "do"
-            │   │       │       │   │   ├── closing_loc: (9,48)-(9,51) = "end"
-            │   │       │       │   │   └── numbered_parameters: 0
+            │   │       │       │   │   └── closing_loc: (9,48)-(9,51) = "end"
             │   │       │       │   └── flags: ∅
             │   │       │       └── operator_loc: ∅
             │   │       └── closing_loc: (9,51)-(9,52) = "}"
diff --git a/test/prism/snapshots/whitequark/bug_heredoc_do.txt b/test/prism/snapshots/whitequark/bug_heredoc_do.txt
index ef7b07168f..ccf2fb56fc 100644
--- a/test/prism/snapshots/whitequark/bug_heredoc_do.txt
+++ b/test/prism/snapshots/whitequark/bug_heredoc_do.txt
@@ -26,6 +26,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   ├── closing_loc: (3,0)-(3,3) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,0)-(3,3) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_lambda_leakage.txt b/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
index 651ce872b5..2fd9d0fc0b 100644
--- a/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
+++ b/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
@@ -24,8 +24,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ CallNode (location: (1,14)-(1,19))
             ├── receiver: ∅
             ├── call_operator_loc: ∅
diff --git a/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt b/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt
index 2322b0d671..cf5806d0a2 100644
--- a/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt
+++ b/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt
@@ -35,8 +35,7 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (1,29)-(1,31) = "do"
-        │   │   │           │   │   ├── closing_loc: (1,32)-(1,35) = "end"
-        │   │   │           │   │   └── numbered_parameters: 0
+        │   │   │           │   │   └── closing_loc: (1,32)-(1,35) = "end"
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (1,23)-(1,24) = "="
         │   │   └── end_keyword_loc: (1,37)-(1,40) = "end"
@@ -74,8 +73,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,25)-(3,27) = "do"
-        │   │   │           │   ├── closing_loc: (3,28)-(3,31) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (3,28)-(3,31) = "end"
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: (3,33)-(3,36) = "end"
         │   ├── statements:
@@ -119,8 +117,7 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (5,24)-(5,26) = "do"
-        │   │   │           │   │   ├── closing_loc: (5,27)-(5,30) = "end"
-        │   │   │           │   │   └── numbered_parameters: 0
+        │   │   │           │   │   └── closing_loc: (5,27)-(5,30) = "end"
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (5,18)-(5,19) = "="
         │   │   ├── end_keyword_loc: (5,32)-(5,35) = "end"
@@ -161,8 +158,7 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (7,21)-(7,23) = "do"
-            │   │           │   ├── closing_loc: (7,24)-(7,27) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (7,24)-(7,27) = "end"
             │   │           └── flags: ∅
             │   ├── end_keyword_loc: (7,29)-(7,32) = "end"
             │   └── name: :Foo
diff --git a/test/prism/snapshots/whitequark/kwnilarg.txt b/test/prism/snapshots/whitequark/kwnilarg.txt
index cdd5018f69..2b5902db1a 100644
--- a/test/prism/snapshots/whitequark/kwnilarg.txt
+++ b/test/prism/snapshots/whitequark/kwnilarg.txt
@@ -25,8 +25,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ DefNode (location: (3,0)-(3,17))
         │   ├── name: :f
         │   ├── name_loc: (3,4)-(3,5) = "f"
@@ -81,6 +80,5 @@
             │   │   └── closing_loc: (5,10)-(5,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (5,2)-(5,3) = "{"
-            │   ├── closing_loc: (5,12)-(5,13) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (5,12)-(5,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt b/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
index 4301270e33..2b85b2980e 100644
--- a/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
+++ b/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
@@ -46,10 +46,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │           │   ├── closing_loc: (1,17)-(1,20) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (1,17)-(1,20) = "end"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   ├── closing_loc: (1,21)-(1,22) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,21)-(1,22) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt b/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt
index 4890377405..cbb114dd69 100644
--- a/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt
+++ b/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt
@@ -34,8 +34,7 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (1,22)-(1,24) = "do"
-        │   │   │   │           │   ├── closing_loc: (1,25)-(1,28) = "end"
-        │   │   │   │           │   └── numbered_parameters: 0
+        │   │   │   │           │   └── closing_loc: (1,25)-(1,28) = "end"
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -83,8 +82,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,19)-(3,21) = "do"
-        │   │   │           │   ├── closing_loc: (3,22)-(3,25) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (3,22)-(3,25) = "end"
         │   │   │           └── flags: ∅
         │   │   ├── locals: []
         │   │   ├── def_keyword_loc: (3,6)-(3,9) = "def"
@@ -132,8 +130,7 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (5,27)-(5,29) = "do"
-        │   │   │   │           │   ├── closing_loc: (5,30)-(5,33) = "end"
-        │   │   │   │           │   └── numbered_parameters: 0
+        │   │   │   │           │   └── closing_loc: (5,30)-(5,33) = "end"
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -182,8 +179,7 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (7,24)-(7,26) = "do"
-            │   │           │   ├── closing_loc: (7,27)-(7,30) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (7,27)-(7,30) = "end"
             │   │           └── flags: ∅
             │   ├── locals: []
             │   ├── def_keyword_loc: (7,6)-(7,9) = "def"
diff --git a/test/prism/snapshots/whitequark/next_block.txt b/test/prism/snapshots/whitequark/next_block.txt
index 59cbb69289..b49d3dc4a2 100644
--- a/test/prism/snapshots/whitequark/next_block.txt
+++ b/test/prism/snapshots/whitequark/next_block.txt
@@ -34,8 +34,7 @@
             │   │       │   ├── parameters: ∅
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │       │   ├── closing_loc: (1,16)-(1,19) = "end"
-            │   │       │   └── numbered_parameters: 0
+            │   │       │   └── closing_loc: (1,16)-(1,19) = "end"
             │   │       └── flags: ∅
             │   └── flags: ∅
             └── keyword_loc: (1,0)-(1,4) = "next"
diff --git a/test/prism/snapshots/whitequark/numbered_args_after_27.txt b/test/prism/snapshots/whitequark/numbered_args_after_27.txt
index 79f8edd8cd..af8c0afe55 100644
--- a/test/prism/snapshots/whitequark/numbered_args_after_27.txt
+++ b/test/prism/snapshots/whitequark/numbered_args_after_27.txt
@@ -8,59 +8,61 @@
         │   ├── operator_loc: (1,0)-(1,2) = "->"
         │   ├── opening_loc: (1,3)-(1,5) = "do"
         │   ├── closing_loc: (1,14)-(1,17) = "end"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (1,6)-(1,13))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (1,6)-(1,13))
-        │   │           ├── receiver:
-        │   │           │   @ LocalVariableReadNode (location: (1,6)-(1,8))
-        │   │           │   ├── name: :_1
-        │   │           │   └── depth: 0
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (1,9)-(1,10) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (1,11)-(1,13))
-        │   │           │   ├── arguments: (length: 1)
-        │   │           │   │   └── @ LocalVariableReadNode (location: (1,11)-(1,13))
-        │   │           │   │       ├── name: :_9
-        │   │           │   │       └── depth: 0
-        │   │           │   └── flags: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           ├── block: ∅
-        │   │           └── flags: ∅
-        │   └── numbered_parameters: 9
+        │   ├── parameters:
+        │   │   @ NumberedParametersNode (location: (1,0)-(1,17))
+        │   │   └── maximum: 9
+        │   └── body:
+        │       @ StatementsNode (location: (1,6)-(1,13))
+        │       └── body: (length: 1)
+        │           └── @ CallNode (location: (1,6)-(1,13))
+        │               ├── receiver:
+        │               │   @ LocalVariableReadNode (location: (1,6)-(1,8))
+        │               │   ├── name: :_1
+        │               │   └── depth: 0
+        │               ├── call_operator_loc: ∅
+        │               ├── name: :+
+        │               ├── message_loc: (1,9)-(1,10) = "+"
+        │               ├── opening_loc: ∅
+        │               ├── arguments:
+        │               │   @ ArgumentsNode (location: (1,11)-(1,13))
+        │               │   ├── arguments: (length: 1)
+        │               │   │   └── @ LocalVariableReadNode (location: (1,11)-(1,13))
+        │               │   │       ├── name: :_9
+        │               │   │       └── depth: 0
+        │               │   └── flags: ∅
+        │               ├── closing_loc: ∅
+        │               ├── block: ∅
+        │               └── flags: ∅
         ├── @ LambdaNode (location: (3,0)-(3,13))
         │   ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
         │   ├── operator_loc: (3,0)-(3,2) = "->"
         │   ├── opening_loc: (3,3)-(3,4) = "{"
         │   ├── closing_loc: (3,12)-(3,13) = "}"
-        │   ├── parameters: ∅
-        │   ├── body:
-        │   │   @ StatementsNode (location: (3,5)-(3,12))
-        │   │   └── body: (length: 1)
-        │   │       └── @ CallNode (location: (3,5)-(3,12))
-        │   │           ├── receiver:
-        │   │           │   @ LocalVariableReadNode (location: (3,5)-(3,7))
-        │   │           │   ├── name: :_1
-        │   │           │   └── depth: 0
-        │   │           ├── call_operator_loc: ∅
-        │   │           ├── name: :+
-        │   │           ├── message_loc: (3,8)-(3,9) = "+"
-        │   │           ├── opening_loc: ∅
-        │   │           ├── arguments:
-        │   │           │   @ ArgumentsNode (location: (3,10)-(3,12))
-        │   │           │   ├── arguments: (length: 1)
-        │   │           │   │   └── @ LocalVariableReadNode (location: (3,10)-(3,12))
-        │   │           │   │       ├── name: :_9
-        │   │           │   │       └── depth: 0
-        │   │           │   └── flags: ∅
-        │   │           ├── closing_loc: ∅
-        │   │           ├── block: ∅
-        │   │           └── flags: ∅
-        │   └── numbered_parameters: 9
+        │   ├── parameters:
+        │   │   @ NumberedParametersNode (location: (3,0)-(3,13))
+        │   │   └── maximum: 9
+        │   └── body:
+        │       @ StatementsNode (location: (3,5)-(3,12))
+        │       └── body: (length: 1)
+        │           └── @ CallNode (location: (3,5)-(3,12))
+        │               ├── receiver:
+        │               │   @ LocalVariableReadNode (location: (3,5)-(3,7))
+        │               │   ├── name: :_1
+        │               │   └── depth: 0
+        │               ├── call_operator_loc: ∅
+        │               ├── name: :+
+        │               ├── message_loc: (3,8)-(3,9) = "+"
+        │               ├── opening_loc: ∅
+        │               ├── arguments:
+        │               │   @ ArgumentsNode (location: (3,10)-(3,12))
+        │               │   ├── arguments: (length: 1)
+        │               │   │   └── @ LocalVariableReadNode (location: (3,10)-(3,12))
+        │               │   │       ├── name: :_9
+        │               │   │       └── depth: 0
+        │               │   └── flags: ∅
+        │               ├── closing_loc: ∅
+        │               ├── block: ∅
+        │               └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,16))
         │   ├── receiver: ∅
         │   ├── call_operator_loc: ∅
@@ -72,7 +74,9 @@
         │   ├── block:
         │   │   @ BlockNode (location: (5,2)-(5,16))
         │   │   ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-        │   │   ├── parameters: ∅
+        │   │   ├── parameters:
+        │   │   │   @ NumberedParametersNode (location: (5,2)-(5,16))
+        │   │   │   └── maximum: 9
         │   │   ├── body:
         │   │   │   @ StatementsNode (location: (5,5)-(5,12))
         │   │   │   └── body: (length: 1)
@@ -96,8 +100,7 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (5,2)-(5,4) = "do"
-        │   │   ├── closing_loc: (5,13)-(5,16) = "end"
-        │   │   └── numbered_parameters: 9
+        │   │   └── closing_loc: (5,13)-(5,16) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (7,0)-(7,13))
             ├── receiver: ∅
@@ -110,7 +113,9 @@
             ├── block:
             │   @ BlockNode (location: (7,2)-(7,13))
             │   ├── locals: [:_1, :_2, :_3, :_4, :_5, :_6, :_7, :_8, :_9]
-            │   ├── parameters: ∅
+            │   ├── parameters:
+            │   │   @ NumberedParametersNode (location: (7,2)-(7,13))
+            │   │   └── maximum: 9
             │   ├── body:
             │   │   @ StatementsNode (location: (7,4)-(7,11))
             │   │   └── body: (length: 1)
@@ -134,6 +139,5 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (7,2)-(7,3) = "{"
-            │   ├── closing_loc: (7,12)-(7,13) = "}"
-            │   └── numbered_parameters: 9
+            │   └── closing_loc: (7,12)-(7,13) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_272.txt b/test/prism/snapshots/whitequark/parser_bug_272.txt
index 2b5448c9fc..f8f29f8137 100644
--- a/test/prism/snapshots/whitequark/parser_bug_272.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_272.txt
@@ -37,6 +37,5 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   ├── closing_loc: (1,12)-(1,15) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,12)-(1,15) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_507.txt b/test/prism/snapshots/whitequark/parser_bug_507.txt
index ea146fbabe..d2a3d3cba8 100644
--- a/test/prism/snapshots/whitequark/parser_bug_507.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_507.txt
@@ -31,6 +31,5 @@
             │   │   ├── locals: (length: 0)
             │   │   ├── opening_loc: ∅
             │   │   └── closing_loc: ∅
-            │   ├── body: ∅
-            │   └── numbered_parameters: 0
+            │   └── body: ∅
             └── operator_loc: (1,2)-(1,3) = "="
diff --git a/test/prism/snapshots/whitequark/parser_bug_525.txt b/test/prism/snapshots/whitequark/parser_bug_525.txt
index 4377aff91e..f875dc8116 100644
--- a/test/prism/snapshots/whitequark/parser_bug_525.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_525.txt
@@ -56,10 +56,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,21)-(1,23) = "do"
-            │   │           │   ├── closing_loc: (1,24)-(1,27) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (1,24)-(1,27) = "end"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,12)-(1,14) = "do"
-            │   ├── closing_loc: (1,29)-(1,32) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,29)-(1,32) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_604.txt b/test/prism/snapshots/whitequark/parser_bug_604.txt
index 66e2c3ae92..12a05c31cb 100644
--- a/test/prism/snapshots/whitequark/parser_bug_604.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_604.txt
@@ -53,6 +53,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   ├── closing_loc: (1,11)-(1,14) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,11)-(1,14) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_645.txt b/test/prism/snapshots/whitequark/parser_bug_645.txt
index f737157284..4eee6234c1 100644
--- a/test/prism/snapshots/whitequark/parser_bug_645.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_645.txt
@@ -31,5 +31,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,10)-(1,11) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/procarg0.txt b/test/prism/snapshots/whitequark/procarg0.txt
index c5da626acb..62eaaca68f 100644
--- a/test/prism/snapshots/whitequark/procarg0.txt
+++ b/test/prism/snapshots/whitequark/procarg0.txt
@@ -40,8 +40,7 @@
         │   │   │   └── closing_loc: (1,15)-(1,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,2)-(1,3) = "{"
-        │   │   ├── closing_loc: (1,17)-(1,18) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,17)-(1,18) = "}"
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,11))
             ├── receiver: ∅
@@ -72,6 +71,5 @@
             │   │   └── closing_loc: (3,8)-(3,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (3,2)-(3,3) = "{"
-            │   ├── closing_loc: (3,10)-(3,11) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (3,10)-(3,11) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt b/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
index 0208513ee3..72b6842f42 100644
--- a/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
+++ b/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
@@ -9,19 +9,18 @@
             ├── opening_loc: (1,3)-(1,5) = "do"
             ├── closing_loc: (1,14)-(1,17) = "end"
             ├── parameters: ∅
-            ├── body:
-            │   @ BeginNode (location: (1,6)-(1,17))
-            │   ├── begin_keyword_loc: ∅
-            │   ├── statements: ∅
-            │   ├── rescue_clause:
-            │   │   @ RescueNode (location: (1,6)-(1,12))
-            │   │   ├── keyword_loc: (1,6)-(1,12) = "rescue"
-            │   │   ├── exceptions: (length: 0)
-            │   │   ├── operator_loc: ∅
-            │   │   ├── reference: ∅
-            │   │   ├── statements: ∅
-            │   │   └── consequent: ∅
-            │   ├── else_clause: ∅
-            │   ├── ensure_clause: ∅
-            │   └── end_keyword_loc: (1,14)-(1,17) = "end"
-            └── numbered_parameters: 0
+            └── body:
+                @ BeginNode (location: (1,6)-(1,17))
+                ├── begin_keyword_loc: ∅
+                ├── statements: ∅
+                ├── rescue_clause:
+                │   @ RescueNode (location: (1,6)-(1,12))
+                │   ├── keyword_loc: (1,6)-(1,12) = "rescue"
+                │   ├── exceptions: (length: 0)
+                │   ├── operator_loc: ∅
+                │   ├── reference: ∅
+                │   ├── statements: ∅
+                │   └── consequent: ∅
+                ├── else_clause: ∅
+                ├── ensure_clause: ∅
+                └── end_keyword_loc: (1,14)-(1,17) = "end"
diff --git a/test/prism/snapshots/whitequark/rescue_without_begin_end.txt b/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
index f2591d2d20..c997d99d46 100644
--- a/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
+++ b/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
@@ -55,6 +55,5 @@
             │   │   ├── ensure_clause: ∅
             │   │   └── end_keyword_loc: (1,27)-(1,30) = "end"
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   ├── closing_loc: (1,27)-(1,30) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,27)-(1,30) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/return_block.txt b/test/prism/snapshots/whitequark/return_block.txt
index 453ed258f8..f963bedff1 100644
--- a/test/prism/snapshots/whitequark/return_block.txt
+++ b/test/prism/snapshots/whitequark/return_block.txt
@@ -35,7 +35,6 @@
                 │       │   ├── parameters: ∅
                 │       │   ├── body: ∅
                 │       │   ├── opening_loc: (1,15)-(1,17) = "do"
-                │       │   ├── closing_loc: (1,18)-(1,21) = "end"
-                │       │   └── numbered_parameters: 0
+                │       │   └── closing_loc: (1,18)-(1,21) = "end"
                 │       └── flags: ∅
                 └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_10653.txt b/test/prism/snapshots/whitequark/ruby_bug_10653.txt
index 4fac961de1..35a3e966bd 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_10653.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_10653.txt
@@ -25,8 +25,7 @@
         │   │           │   ├── parameters: ∅
         │   │           │   ├── body: ∅
         │   │           │   ├── opening_loc: (1,14)-(1,16) = "do"
-        │   │           │   ├── closing_loc: (1,17)-(1,20) = "end"
-        │   │           │   └── numbered_parameters: 0
+        │   │           │   └── closing_loc: (1,17)-(1,20) = "end"
         │   │           └── flags: ∅
         │   ├── consequent:
         │   │   @ ElseNode (location: (1,21)-(1,33))
@@ -48,8 +47,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (1,27)-(1,29) = "do"
-        │   │   │           │   ├── closing_loc: (1,30)-(1,33) = "end"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (1,30)-(1,33) = "end"
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: ∅
         │   └── end_keyword_loc: ∅
@@ -75,8 +73,7 @@
         │   │           │   ├── parameters: ∅
         │   │           │   ├── body: ∅
         │   │           │   ├── opening_loc: (3,14)-(3,15) = "{"
-        │   │           │   ├── closing_loc: (3,15)-(3,16) = "}"
-        │   │           │   └── numbered_parameters: 0
+        │   │           │   └── closing_loc: (3,15)-(3,16) = "}"
         │   │           └── flags: ∅
         │   ├── consequent:
         │   │   @ ElseNode (location: (3,17)-(3,25))
@@ -98,8 +95,7 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,23)-(3,24) = "{"
-        │   │   │           │   ├── closing_loc: (3,24)-(3,25) = "}"
-        │   │   │           │   └── numbered_parameters: 0
+        │   │   │           │   └── closing_loc: (3,24)-(3,25) = "}"
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: ∅
         │   └── end_keyword_loc: ∅
@@ -160,8 +156,7 @@
             │           │   │           ├── block: ∅
             │           │   │           └── flags: ∅
             │           │   ├── opening_loc: (5,13)-(5,15) = "do"
-            │           │   ├── closing_loc: (5,24)-(5,27) = "end"
-            │           │   └── numbered_parameters: 0
+            │           │   └── closing_loc: (5,24)-(5,27) = "end"
             │           └── flags: ∅
             ├── consequent:
             │   @ ElseNode (location: (5,28)-(5,31))
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11107.txt b/test/prism/snapshots/whitequark/ruby_bug_11107.txt
index a794a6f5a7..1d8e922a1f 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11107.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11107.txt
@@ -23,27 +23,25 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (1,4)-(1,5) = "("
             │   │       │   └── closing_loc: (1,5)-(1,6) = ")"
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (1,10)-(1,20))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ CallNode (location: (1,10)-(1,20))
-            │   │       │           ├── receiver: ∅
-            │   │       │           ├── call_operator_loc: ∅
-            │   │       │           ├── name: :a
-            │   │       │           ├── message_loc: (1,10)-(1,11) = "a"
-            │   │       │           ├── opening_loc: (1,11)-(1,12) = "("
-            │   │       │           ├── arguments: ∅
-            │   │       │           ├── closing_loc: (1,12)-(1,13) = ")"
-            │   │       │           ├── block:
-            │   │       │           │   @ BlockNode (location: (1,14)-(1,20))
-            │   │       │           │   ├── locals: []
-            │   │       │           │   ├── parameters: ∅
-            │   │       │           │   ├── body: ∅
-            │   │       │           │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │       │           │   ├── closing_loc: (1,17)-(1,20) = "end"
-            │   │       │           │   └── numbered_parameters: 0
-            │   │       │           └── flags: ∅
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (1,10)-(1,20))
+            │   │           └── body: (length: 1)
+            │   │               └── @ CallNode (location: (1,10)-(1,20))
+            │   │                   ├── receiver: ∅
+            │   │                   ├── call_operator_loc: ∅
+            │   │                   ├── name: :a
+            │   │                   ├── message_loc: (1,10)-(1,11) = "a"
+            │   │                   ├── opening_loc: (1,11)-(1,12) = "("
+            │   │                   ├── arguments: ∅
+            │   │                   ├── closing_loc: (1,12)-(1,13) = ")"
+            │   │                   ├── block:
+            │   │                   │   @ BlockNode (location: (1,14)-(1,20))
+            │   │                   │   ├── locals: []
+            │   │                   │   ├── parameters: ∅
+            │   │                   │   ├── body: ∅
+            │   │                   │   ├── opening_loc: (1,14)-(1,16) = "do"
+            │   │                   │   └── closing_loc: (1,17)-(1,20) = "end"
+            │   │                   └── flags: ∅
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11380.txt b/test/prism/snapshots/whitequark/ruby_bug_11380.txt
index 29850868cd..6f74ac0d6f 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11380.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11380.txt
@@ -18,15 +18,14 @@
             │   │   │   ├── opening_loc: (1,5)-(1,6) = "{"
             │   │   │   ├── closing_loc: (1,14)-(1,15) = "}"
             │   │   │   ├── parameters: ∅
-            │   │   │   ├── body:
-            │   │   │   │   @ StatementsNode (location: (1,7)-(1,13))
-            │   │   │   │   └── body: (length: 1)
-            │   │   │   │       └── @ SymbolNode (location: (1,7)-(1,13))
-            │   │   │   │           ├── opening_loc: (1,7)-(1,8) = ":"
-            │   │   │   │           ├── value_loc: (1,8)-(1,13) = "hello"
-            │   │   │   │           ├── closing_loc: ∅
-            │   │   │   │           └── unescaped: "hello"
-            │   │   │   └── numbered_parameters: 0
+            │   │   │   └── body:
+            │   │   │       @ StatementsNode (location: (1,7)-(1,13))
+            │   │   │       └── body: (length: 1)
+            │   │   │           └── @ SymbolNode (location: (1,7)-(1,13))
+            │   │   │               ├── opening_loc: (1,7)-(1,8) = ":"
+            │   │   │               ├── value_loc: (1,8)-(1,13) = "hello"
+            │   │   │               ├── closing_loc: ∅
+            │   │   │               └── unescaped: "hello"
             │   │   └── @ KeywordHashNode (location: (1,17)-(1,21))
             │   │       └── elements: (length: 1)
             │   │           └── @ AssocNode (location: (1,17)-(1,21))
@@ -48,6 +47,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,22)-(1,24) = "do"
-            │   ├── closing_loc: (1,25)-(1,28) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,25)-(1,28) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873.txt b/test/prism/snapshots/whitequark/ruby_bug_11873.txt
index b4a4173dc1..d094841587 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873.txt
@@ -62,8 +62,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,14)-(1,16) = "do"
-        │   │   ├── closing_loc: (1,17)-(1,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,17)-(1,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,20))
         │   ├── receiver: ∅
@@ -124,8 +123,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,14)-(3,16) = "do"
-        │   │   ├── closing_loc: (3,17)-(3,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,17)-(3,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,21))
         │   ├── receiver: ∅
@@ -186,8 +184,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,15)-(5,17) = "do"
-        │   │   ├── closing_loc: (5,18)-(5,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,18)-(5,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,21))
         │   ├── receiver: ∅
@@ -248,8 +245,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,15)-(7,17) = "do"
-        │   │   ├── closing_loc: (7,18)-(7,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (7,18)-(7,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,21))
         │   ├── receiver: ∅
@@ -310,8 +306,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,15)-(9,17) = "do"
-        │   │   ├── closing_loc: (9,18)-(9,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (9,18)-(9,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,22))
         │   ├── receiver: ∅
@@ -372,8 +367,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,16)-(11,18) = "do"
-        │   │   ├── closing_loc: (11,19)-(11,22) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (11,19)-(11,22) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,20))
         │   ├── receiver: ∅
@@ -423,8 +417,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (13,3)-(13,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (13,7)-(13,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (13,7)-(13,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ StringNode (location: (13,10)-(13,13))
         │   │   │       ├── flags: ∅
@@ -440,8 +433,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,14)-(13,16) = "do"
-        │   │   ├── closing_loc: (13,17)-(13,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (13,17)-(13,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,20))
         │   ├── receiver: ∅
@@ -491,8 +483,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (15,3)-(15,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (15,7)-(15,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (15,7)-(15,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (15,10)-(15,13))
         │   │   │       ├── opening_loc: (15,10)-(15,11) = "/"
@@ -508,8 +499,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,14)-(15,16) = "do"
-        │   │   ├── closing_loc: (15,17)-(15,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (15,17)-(15,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,21))
         │   ├── receiver: ∅
@@ -559,8 +549,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (17,3)-(17,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (17,7)-(17,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (17,7)-(17,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (17,10)-(17,14))
         │   │   │       ├── opening_loc: (17,10)-(17,11) = "/"
@@ -576,8 +565,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,15)-(17,17) = "do"
-        │   │   ├── closing_loc: (17,18)-(17,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (17,18)-(17,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(19,21))
         │   ├── receiver: ∅
@@ -627,8 +615,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (19,3)-(19,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (19,8)-(19,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (19,8)-(19,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ StringNode (location: (19,11)-(19,14))
         │   │   │       ├── flags: ∅
@@ -644,8 +631,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,15)-(19,17) = "do"
-        │   │   ├── closing_loc: (19,18)-(19,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (19,18)-(19,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (21,0)-(21,21))
         │   ├── receiver: ∅
@@ -695,8 +681,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (21,8)-(21,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (21,8)-(21,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (21,11)-(21,14))
         │   │   │       ├── opening_loc: (21,11)-(21,12) = "/"
@@ -712,8 +697,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (21,15)-(21,17) = "do"
-        │   │   ├── closing_loc: (21,18)-(21,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (21,18)-(21,21) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (23,0)-(23,22))
             ├── receiver: ∅
@@ -763,8 +747,7 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (23,3)-(23,4) = "{"
-            │   │   │   │   ├── closing_loc: (23,8)-(23,9) = "}"
-            │   │   │   │   └── numbered_parameters: 0
+            │   │   │   │   └── closing_loc: (23,8)-(23,9) = "}"
             │   │   │   └── flags: ∅
             │   │   └── @ RegularExpressionNode (location: (23,11)-(23,15))
             │   │       ├── opening_loc: (23,11)-(23,12) = "/"
@@ -780,6 +763,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (23,16)-(23,18) = "do"
-            │   ├── closing_loc: (23,19)-(23,22) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (23,19)-(23,22) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt b/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
index 45857739c5..77da1d947c 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
@@ -58,8 +58,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,12)-(1,14) = "do"
-        │   │   ├── closing_loc: (1,15)-(1,18) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,15)-(1,18) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,20))
         │   ├── receiver: ∅
@@ -115,8 +114,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,14)-(3,16) = "do"
-        │   │   ├── closing_loc: (3,17)-(3,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,17)-(3,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,21))
         │   ├── receiver: ∅
@@ -174,8 +172,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,15)-(5,17) = "do"
-        │   │   ├── closing_loc: (5,18)-(5,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,18)-(5,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,21))
         │   ├── receiver: ∅
@@ -233,8 +230,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,15)-(7,17) = "do"
-        │   │   ├── closing_loc: (7,18)-(7,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (7,18)-(7,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,19))
         │   ├── receiver: ∅
@@ -294,8 +290,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,13)-(9,15) = "do"
-        │   │   ├── closing_loc: (9,16)-(9,19) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (9,16)-(9,19) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,19))
         │   ├── receiver: ∅
@@ -352,8 +347,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,13)-(11,15) = "do"
-        │   │   ├── closing_loc: (11,16)-(11,19) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (11,16)-(11,19) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,21))
         │   ├── receiver: ∅
@@ -409,8 +403,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,15)-(13,17) = "do"
-        │   │   ├── closing_loc: (13,18)-(13,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (13,18)-(13,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,22))
         │   ├── receiver: ∅
@@ -468,8 +461,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,16)-(15,18) = "do"
-        │   │   ├── closing_loc: (15,19)-(15,22) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (15,19)-(15,22) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,22))
         │   ├── receiver: ∅
@@ -527,8 +519,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,16)-(17,18) = "do"
-        │   │   ├── closing_loc: (17,19)-(17,22) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (17,19)-(17,22) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(19,20))
         │   ├── receiver: ∅
@@ -588,8 +579,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,14)-(19,16) = "do"
-        │   │   ├── closing_loc: (19,17)-(19,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (19,17)-(19,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (21,0)-(21,18))
         │   ├── receiver: ∅
@@ -639,8 +629,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (21,7)-(21,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (21,7)-(21,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ IntegerNode (location: (21,10)-(21,11))
         │   │   │       └── flags: decimal
@@ -652,8 +641,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (21,12)-(21,14) = "do"
-        │   │   ├── closing_loc: (21,15)-(21,18) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (21,15)-(21,18) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(23,20))
         │   ├── receiver: ∅
@@ -703,8 +691,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (23,3)-(23,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (23,7)-(23,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (23,7)-(23,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ FloatNode (location: (23,10)-(23,13))
         │   │   └── flags: ∅
@@ -715,8 +702,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (23,14)-(23,16) = "do"
-        │   │   ├── closing_loc: (23,17)-(23,20) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (23,17)-(23,20) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (25,0)-(25,21))
         │   ├── receiver: ∅
@@ -766,8 +752,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (25,3)-(25,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (25,7)-(25,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (25,7)-(25,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ ImaginaryNode (location: (25,10)-(25,14))
         │   │   │       └── numeric:
@@ -780,8 +765,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (25,15)-(25,17) = "do"
-        │   │   ├── closing_loc: (25,18)-(25,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (25,18)-(25,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (27,0)-(27,21))
         │   ├── receiver: ∅
@@ -831,8 +815,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (27,3)-(27,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (27,7)-(27,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (27,7)-(27,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RationalNode (location: (27,10)-(27,14))
         │   │   │       └── numeric:
@@ -845,8 +828,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (27,15)-(27,17) = "do"
-        │   │   ├── closing_loc: (27,18)-(27,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (27,18)-(27,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (29,0)-(29,19))
         │   ├── receiver: ∅
@@ -896,8 +878,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (29,3)-(29,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (29,7)-(29,8) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (29,7)-(29,8) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ SymbolNode (location: (29,10)-(29,12))
         │   │   │       ├── opening_loc: (29,10)-(29,11) = ":"
@@ -912,8 +893,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (29,13)-(29,15) = "do"
-        │   │   ├── closing_loc: (29,16)-(29,19) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (29,16)-(29,19) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,19))
         │   ├── receiver: ∅
@@ -963,8 +943,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (31,3)-(31,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (31,8)-(31,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (31,8)-(31,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ IntegerNode (location: (31,11)-(31,12))
         │   │   │       └── flags: decimal
@@ -976,8 +955,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (31,13)-(31,15) = "do"
-        │   │   ├── closing_loc: (31,16)-(31,19) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (31,16)-(31,19) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,21))
         │   ├── receiver: ∅
@@ -1027,8 +1005,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (33,3)-(33,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (33,8)-(33,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (33,8)-(33,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ FloatNode (location: (33,11)-(33,14))
         │   │   └── flags: ∅
@@ -1039,8 +1016,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (33,15)-(33,17) = "do"
-        │   │   ├── closing_loc: (33,18)-(33,21) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (33,18)-(33,21) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,22))
         │   ├── receiver: ∅
@@ -1090,8 +1066,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (35,3)-(35,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (35,8)-(35,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (35,8)-(35,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ ImaginaryNode (location: (35,11)-(35,15))
         │   │   │       └── numeric:
@@ -1104,8 +1079,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,16)-(35,18) = "do"
-        │   │   ├── closing_loc: (35,19)-(35,22) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (35,19)-(35,22) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (37,0)-(37,22))
         │   ├── receiver: ∅
@@ -1155,8 +1129,7 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (37,3)-(37,4) = "{"
-        │   │   │   │   │   ├── closing_loc: (37,8)-(37,9) = "}"
-        │   │   │   │   │   └── numbered_parameters: 0
+        │   │   │   │   │   └── closing_loc: (37,8)-(37,9) = "}"
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RationalNode (location: (37,11)-(37,15))
         │   │   │       └── numeric:
@@ -1169,8 +1142,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (37,16)-(37,18) = "do"
-        │   │   ├── closing_loc: (37,19)-(37,22) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (37,19)-(37,22) = "end"
         │   └── flags: ∅
         └── @ CallNode (location: (39,0)-(39,20))
             ├── receiver: ∅
@@ -1220,8 +1192,7 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (39,3)-(39,4) = "{"
-            │   │   │   │   ├── closing_loc: (39,8)-(39,9) = "}"
-            │   │   │   │   └── numbered_parameters: 0
+            │   │   │   │   └── closing_loc: (39,8)-(39,9) = "}"
             │   │   │   └── flags: ∅
             │   │   └── @ SymbolNode (location: (39,11)-(39,13))
             │   │       ├── opening_loc: (39,11)-(39,12) = ":"
@@ -1236,6 +1207,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (39,14)-(39,16) = "do"
-            │   ├── closing_loc: (39,17)-(39,20) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (39,17)-(39,20) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt b/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
index c649fe4cb9..6f052e5e6f 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
@@ -74,8 +74,7 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   │   │   │   ├── closing_loc: (1,12)-(1,13) = "}"
-            │   │   │   │   └── numbered_parameters: 0
+            │   │   │   │   └── closing_loc: (1,12)-(1,13) = "}"
             │   │   │   └── flags: ∅
             │   │   └── @ CallNode (location: (1,15)-(1,18))
             │   │       ├── receiver: ∅
@@ -95,6 +94,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,19)-(1,21) = "do"
-            │   ├── closing_loc: (1,22)-(1,25) = "end"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,22)-(1,25) = "end"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_13547.txt b/test/prism/snapshots/whitequark/ruby_bug_13547.txt
index b2805a83c7..becb34f0bb 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_13547.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_13547.txt
@@ -27,6 +27,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   ├── closing_loc: (1,8)-(1,9) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,8)-(1,9) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_14690.txt b/test/prism/snapshots/whitequark/ruby_bug_14690.txt
index 8282a2f3a9..bccfa5d878 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_14690.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_14690.txt
@@ -52,10 +52,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │           │   ├── closing_loc: (1,18)-(1,21) = "end"
-            │   │           │   └── numbered_parameters: 0
+            │   │           │   └── closing_loc: (1,18)-(1,21) = "end"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   ├── closing_loc: (1,22)-(1,23) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,22)-(1,23) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_15789.txt b/test/prism/snapshots/whitequark/ruby_bug_15789.txt
index 6346624157..ec7cd2a739 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_15789.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_15789.txt
@@ -33,14 +33,15 @@
         │   │   │       │   │   │           ├── operator_loc: (1,9)-(1,11) = "->"
         │   │   │       │   │   │           ├── opening_loc: (1,11)-(1,12) = "{"
         │   │   │       │   │   │           ├── closing_loc: (1,14)-(1,15) = "}"
-        │   │   │       │   │   │           ├── parameters: ∅
-        │   │   │       │   │   │           ├── body:
-        │   │   │       │   │   │           │   @ StatementsNode (location: (1,12)-(1,14))
-        │   │   │       │   │   │           │   └── body: (length: 1)
-        │   │   │       │   │   │           │       └── @ LocalVariableReadNode (location: (1,12)-(1,14))
-        │   │   │       │   │   │           │           ├── name: :_1
-        │   │   │       │   │   │           │           └── depth: 0
-        │   │   │       │   │   │           └── numbered_parameters: 1
+        │   │   │       │   │   │           ├── parameters:
+        │   │   │       │   │   │           │   @ NumberedParametersNode (location: (1,9)-(1,15))
+        │   │   │       │   │   │           │   └── maximum: 1
+        │   │   │       │   │   │           └── body:
+        │   │   │       │   │   │               @ StatementsNode (location: (1,12)-(1,14))
+        │   │   │       │   │   │               └── body: (length: 1)
+        │   │   │       │   │   │                   └── @ LocalVariableReadNode (location: (1,12)-(1,14))
+        │   │   │       │   │   │                       ├── name: :_1
+        │   │   │       │   │   │                       └── depth: 0
         │   │   │       │   │   ├── rest: ∅
         │   │   │       │   │   ├── posts: (length: 0)
         │   │   │       │   │   ├── keywords: (length: 0)
@@ -49,13 +50,12 @@
         │   │   │       │   ├── locals: (length: 0)
         │   │   │       │   ├── opening_loc: (1,4)-(1,5) = "("
         │   │   │       │   └── closing_loc: (1,15)-(1,16) = ")"
-        │   │   │       ├── body:
-        │   │   │       │   @ StatementsNode (location: (1,18)-(1,19))
-        │   │   │       │   └── body: (length: 1)
-        │   │   │       │       └── @ LocalVariableReadNode (location: (1,18)-(1,19))
-        │   │   │       │           ├── name: :a
-        │   │   │       │           └── depth: 0
-        │   │   │       └── numbered_parameters: 0
+        │   │   │       └── body:
+        │   │   │           @ StatementsNode (location: (1,18)-(1,19))
+        │   │   │           └── body: (length: 1)
+        │   │   │               └── @ LocalVariableReadNode (location: (1,18)-(1,19))
+        │   │   │                   ├── name: :a
+        │   │   │                   └── depth: 0
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -92,26 +92,26 @@
             │   │       │   │   │           ├── operator_loc: (3,8)-(3,10) = "->"
             │   │       │   │   │           ├── opening_loc: (3,10)-(3,11) = "{"
             │   │       │   │   │           ├── closing_loc: (3,13)-(3,14) = "}"
-            │   │       │   │   │           ├── parameters: ∅
-            │   │       │   │   │           ├── body:
-            │   │       │   │   │           │   @ StatementsNode (location: (3,11)-(3,13))
-            │   │       │   │   │           │   └── body: (length: 1)
-            │   │       │   │   │           │       └── @ LocalVariableReadNode (location: (3,11)-(3,13))
-            │   │       │   │   │           │           ├── name: :_1
-            │   │       │   │   │           │           └── depth: 0
-            │   │       │   │   │           └── numbered_parameters: 1
+            │   │       │   │   │           ├── parameters:
+            │   │       │   │   │           │   @ NumberedParametersNode (location: (3,8)-(3,14))
+            │   │       │   │   │           │   └── maximum: 1
+            │   │       │   │   │           └── body:
+            │   │       │   │   │               @ StatementsNode (location: (3,11)-(3,13))
+            │   │       │   │   │               └── body: (length: 1)
+            │   │       │   │   │                   └── @ LocalVariableReadNode (location: (3,11)-(3,13))
+            │   │       │   │   │                       ├── name: :_1
+            │   │       │   │   │                       └── depth: 0
             │   │       │   │   ├── keyword_rest: ∅
             │   │       │   │   └── block: ∅
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (3,4)-(3,5) = "("
             │   │       │   └── closing_loc: (3,14)-(3,15) = ")"
-            │   │       ├── body:
-            │   │       │   @ StatementsNode (location: (3,17)-(3,18))
-            │   │       │   └── body: (length: 1)
-            │   │       │       └── @ LocalVariableReadNode (location: (3,17)-(3,18))
-            │   │       │           ├── name: :a
-            │   │       │           └── depth: 0
-            │   │       └── numbered_parameters: 0
+            │   │       └── body:
+            │   │           @ StatementsNode (location: (3,17)-(3,18))
+            │   │           └── body: (length: 1)
+            │   │               └── @ LocalVariableReadNode (location: (3,17)-(3,18))
+            │   │                   ├── name: :a
+            │   │                   └── depth: 0
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/whitequark/send_block_chain_cmd.txt b/test/prism/snapshots/whitequark/send_block_chain_cmd.txt
index 42f90902a8..40e59aa278 100644
--- a/test/prism/snapshots/whitequark/send_block_chain_cmd.txt
+++ b/test/prism/snapshots/whitequark/send_block_chain_cmd.txt
@@ -24,8 +24,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (1,7)-(1,9) = "do"
-        │   │   │   ├── closing_loc: (1,10)-(1,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (1,10)-(1,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (1,13)-(1,14) = "."
         │   ├── name: :fun
@@ -69,8 +68,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (3,7)-(3,9) = "do"
-        │   │   │   ├── closing_loc: (3,10)-(3,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (3,10)-(3,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (3,13)-(3,14) = "."
         │   ├── name: :fun
@@ -97,8 +95,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,22)-(3,24) = "do"
-        │   │   ├── closing_loc: (3,25)-(3,28) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,25)-(3,28) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,20))
         │   ├── receiver:
@@ -121,8 +118,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (5,7)-(5,9) = "do"
-        │   │   │   ├── closing_loc: (5,10)-(5,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (5,10)-(5,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (5,13)-(5,14) = "."
         │   ├── name: :fun
@@ -136,8 +132,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,18)-(5,19) = "{"
-        │   │   ├── closing_loc: (5,19)-(5,20) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,19)-(5,20) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,22))
         │   ├── receiver:
@@ -160,8 +155,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (7,7)-(7,9) = "do"
-        │   │   │   ├── closing_loc: (7,10)-(7,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (7,10)-(7,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (7,13)-(7,14) = "."
         │   ├── name: :fun
@@ -205,8 +199,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (9,7)-(9,9) = "do"
-        │   │   │   ├── closing_loc: (9,10)-(9,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (9,10)-(9,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (9,13)-(9,14) = "."
         │   ├── name: :fun
@@ -233,8 +226,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,23)-(9,24) = "{"
-        │   │   ├── closing_loc: (9,24)-(9,25) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (9,24)-(9,25) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,22))
         │   ├── receiver:
@@ -257,8 +249,7 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (11,7)-(11,9) = "do"
-        │   │   │   ├── closing_loc: (11,10)-(11,13) = "end"
-        │   │   │   └── numbered_parameters: 0
+        │   │   │   └── closing_loc: (11,10)-(11,13) = "end"
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (11,13)-(11,15) = "::"
         │   ├── name: :fun
@@ -302,8 +293,7 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (13,7)-(13,9) = "do"
-            │   │   ├── closing_loc: (13,10)-(13,13) = "end"
-            │   │   └── numbered_parameters: 0
+            │   │   └── closing_loc: (13,10)-(13,13) = "end"
             │   └── flags: ∅
             ├── call_operator_loc: (13,13)-(13,15) = "::"
             ├── name: :fun
diff --git a/test/prism/snapshots/whitequark/send_block_conditional.txt b/test/prism/snapshots/whitequark/send_block_conditional.txt
index 16b12fb6ec..ed736996b5 100644
--- a/test/prism/snapshots/whitequark/send_block_conditional.txt
+++ b/test/prism/snapshots/whitequark/send_block_conditional.txt
@@ -27,6 +27,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   ├── closing_loc: (1,10)-(1,11) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,10)-(1,11) = "}"
             └── flags: safe_navigation
diff --git a/test/prism/snapshots/whitequark/send_lambda.txt b/test/prism/snapshots/whitequark/send_lambda.txt
index acacf50035..b39992d868 100644
--- a/test/prism/snapshots/whitequark/send_lambda.txt
+++ b/test/prism/snapshots/whitequark/send_lambda.txt
@@ -26,21 +26,18 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         ├── @ LambdaNode (location: (3,0)-(3,9))
         │   ├── locals: []
         │   ├── operator_loc: (3,0)-(3,2) = "->"
         │   ├── opening_loc: (3,3)-(3,5) = "do"
         │   ├── closing_loc: (3,6)-(3,9) = "end"
         │   ├── parameters: ∅
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ LambdaNode (location: (5,0)-(5,5))
             ├── locals: []
             ├── operator_loc: (5,0)-(5,2) = "->"
             ├── opening_loc: (5,2)-(5,3) = "{"
             ├── closing_loc: (5,4)-(5,5) = "}"
             ├── parameters: ∅
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/send_lambda_args.txt b/test/prism/snapshots/whitequark/send_lambda_args.txt
index 30f859313b..0e5dd9a7c0 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args.txt
@@ -24,8 +24,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,3)-(1,4) = "("
         │   │   └── closing_loc: (1,5)-(1,6) = ")"
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ LambdaNode (location: (3,0)-(3,9))
             ├── locals: [:a]
             ├── operator_loc: (3,0)-(3,2) = "->"
@@ -47,5 +46,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (3,2)-(3,3) = "("
             │   └── closing_loc: (3,4)-(3,5) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt b/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
index 6ffc7d8a62..913c9a9bb0 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
@@ -28,8 +28,7 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   ├── body: ∅
-        │   └── numbered_parameters: 0
+        │   └── body: ∅
         └── @ LambdaNode (location: (3,0)-(3,9))
             ├── locals: [:a]
             ├── operator_loc: (3,0)-(3,2) = "->"
@@ -52,5 +51,4 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt b/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
index cf5893c6d2..2e1160427c 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
@@ -28,5 +28,4 @@
             │   │       └── name: :bar
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,14)-(1,15) = ")"
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/send_lambda_legacy.txt b/test/prism/snapshots/whitequark/send_lambda_legacy.txt
index c03950391a..3a64e941b6 100644
--- a/test/prism/snapshots/whitequark/send_lambda_legacy.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_legacy.txt
@@ -9,5 +9,4 @@
             ├── opening_loc: (1,2)-(1,3) = "{"
             ├── closing_loc: (1,4)-(1,5) = "}"
             ├── parameters: ∅
-            ├── body: ∅
-            └── numbered_parameters: 0
+            └── body: ∅
diff --git a/test/prism/snapshots/whitequark/send_self_block.txt b/test/prism/snapshots/whitequark/send_self_block.txt
index 7e095907dc..7bbee61474 100644
--- a/test/prism/snapshots/whitequark/send_self_block.txt
+++ b/test/prism/snapshots/whitequark/send_self_block.txt
@@ -17,8 +17,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,6) = "do"
-        │   │   ├── closing_loc: (1,7)-(1,10) = "end"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,7)-(1,10) = "end"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,7))
         │   ├── receiver: ∅
@@ -34,8 +33,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,4)-(3,5) = "{"
-        │   │   ├── closing_loc: (3,6)-(3,7) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,6)-(3,7) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,9))
         │   ├── receiver: ∅
@@ -51,8 +49,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,6)-(5,7) = "{"
-        │   │   ├── closing_loc: (5,8)-(5,9) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (5,8)-(5,9) = "}"
         │   └── flags: ∅
         └── @ CallNode (location: (7,0)-(7,10))
             ├── receiver: ∅
@@ -73,6 +70,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (7,7)-(7,8) = "{"
-            │   ├── closing_loc: (7,9)-(7,10) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (7,9)-(7,10) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/space_args_arg_block.txt b/test/prism/snapshots/whitequark/space_args_arg_block.txt
index 3b46484380..b870fc66d7 100644
--- a/test/prism/snapshots/whitequark/space_args_arg_block.txt
+++ b/test/prism/snapshots/whitequark/space_args_arg_block.txt
@@ -38,8 +38,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,12)-(1,13) = "{"
-        │   │   ├── closing_loc: (1,13)-(1,14) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (1,13)-(1,14) = "}"
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,15))
         │   ├── receiver:
@@ -76,8 +75,7 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,13)-(3,14) = "{"
-        │   │   ├── closing_loc: (3,14)-(3,15) = "}"
-        │   │   └── numbered_parameters: 0
+        │   │   └── closing_loc: (3,14)-(3,15) = "}"
         │   └── flags: ∅
         └── @ CallNode (location: (5,0)-(5,10))
             ├── receiver: ∅
@@ -104,6 +102,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (5,8)-(5,9) = "{"
-            │   ├── closing_loc: (5,9)-(5,10) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (5,9)-(5,10) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/space_args_block.txt b/test/prism/snapshots/whitequark/space_args_block.txt
index 50dd1391ba..28fcecc97f 100644
--- a/test/prism/snapshots/whitequark/space_args_block.txt
+++ b/test/prism/snapshots/whitequark/space_args_block.txt
@@ -24,6 +24,5 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   ├── closing_loc: (1,8)-(1,9) = "}"
-            │   └── numbered_parameters: 0
+            │   └── closing_loc: (1,8)-(1,9) = "}"
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/super_block.txt b/test/prism/snapshots/whitequark/super_block.txt
index b631bb1240..124dd22c53 100644
--- a/test/prism/snapshots/whitequark/super_block.txt
+++ b/test/prism/snapshots/whitequark/super_block.txt
@@ -10,8 +10,7 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (1,6)-(1,8) = "do"
-        │       ├── closing_loc: (1,9)-(1,12) = "end"
-        │       └── numbered_parameters: 0
+        │       └── closing_loc: (1,9)-(1,12) = "end"
         └── @ SuperNode (location: (3,0)-(3,21))
             ├── keyword_loc: (3,0)-(3,5) = "super"
             ├── lparen_loc: ∅
@@ -46,5 +45,4 @@
                 ├── parameters: ∅
                 ├── body: ∅
                 ├── opening_loc: (3,15)-(3,17) = "do"
-                ├── closing_loc: (3,18)-(3,21) = "end"
-                └── numbered_parameters: 0
+                └── closing_loc: (3,18)-(3,21) = "end"
author	Kevin Newton <[email protected]>	2023-11-30 20:47:08 -0500
committer	Kevin Newton <[email protected]>	2023-12-01 12:03:09 -0500
commit	cdb74d74afb87a0d7048a53aaf12d32516033a3c (patch)
tree	b90ab9a755b94de8e55f5f72a6552f3ea4aed3b5
parent	90d9c20a0c0df5565d5f95d5e14c58331fa5922f (diff)