[ruby/prism] Add numbered_parameters field to BlockNode and LambdaNode

We are aware at parse time how many numbered parameters we have
on a BlockNode or LambdaNode, but prior to this commit, did not
store that information anywhere in its own right.

The numbered parameters were stored as locals, but this does not
distinguish them from other locals that have been set, for example
in `a { b = 1; _1 }` there is nothing on the AST that distinguishes
b from _1.

Consumers such as the compiler need to know information about how
many numbered parameters exist to set up their own tables around
parameters. Since we have this information at parse time, we should
compute it here, instead of deferring the work later on.

https://github.com/ruby/prism/commit/bf4a1e124d

194 files changed, 1357 insertions, 869 deletions

diff --git a/prism/config.yml b/prism/config.yml
index 84e458ed8c..353ad50c0d 100644
--- a/prism/config.yml
+++ b/prism/config.yml
@@ -596,6 +596,8 @@ nodes:
         type: location
       - name: closing_loc
         type: location
+      - name: numbered_parameters
+        type: uint32
     comment: |
       Represents a block of ruby code.
 
@@ -1758,6 +1760,8 @@ nodes:
         kind: BlockParametersNode
       - name: body
         type: node?
+      - name: numbered_parameters
+        type: uint32
     comment: |
       Represents using a lambda literal (not the lambda method call).
 
diff --git a/prism/parser.h b/prism/parser.h
index 8c98892ee9..fec1036229 100644
--- a/prism/parser.h
+++ b/prism/parser.h
@@ -468,11 +468,12 @@ typedef struct pm_scope {
     bool explicit_params;
 
     /**
-     * A boolean indicating whether or not this scope has numbered parameters.
+     * An integer indicating the number of numbered parameters on this scope.
      * This is necessary to determine if child blocks are allowed to use
-     * numbered parameters.
+     * numbered parameters, and to pass information to consumers of the AST
+     * about how many numbered parameters exist.
      */
-    bool numbered_params;
+    uint32_t numbered_parameters;
 
     /**
      * A transparent scope is a scope that cannot have locals set on itself.
diff --git a/prism/prism.c b/prism/prism.c
index 971949ca53..05ecc6ad60 100644
--- a/prism/prism.c
+++ b/prism/prism.c
@@ -1465,7 +1465,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) {
+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_t *node = PM_ALLOC_NODE(parser, pm_block_node_t);
 
     *node = (pm_block_node_t) {
@@ -1476,6 +1476,7 @@ 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)
     };
@@ -3937,7 +3938,8 @@ pm_lambda_node_create(
     const pm_token_t *opening,
     const pm_token_t *closing,
     pm_block_parameters_node_t *parameters,
-    pm_node_t *body
+    pm_node_t *body,
+    uint32_t numbered_parameters
 ) {
     pm_lambda_node_t *node = PM_ALLOC_NODE(parser, pm_lambda_node_t);
 
@@ -3954,7 +3956,8 @@ pm_lambda_node_create(
         .opening_loc = PM_LOCATION_TOKEN_VALUE(opening),
         .closing_loc = PM_LOCATION_TOKEN_VALUE(closing),
         .parameters = parameters,
-        .body = body
+        .body = body,
+        .numbered_parameters = numbered_parameters
     };
 
     return node;
@@ -5746,7 +5749,7 @@ pm_parser_scope_push(pm_parser_t *parser, bool closed) {
         .previous = parser->current_scope,
         .closed = closed,
         .explicit_params = false,
-        .numbered_params = false,
+        .numbered_parameters = 0,
         .transparent = false
     };
 
@@ -5768,7 +5771,7 @@ pm_parser_scope_push_transparent(pm_parser_t *parser) {
         .previous = parser->current_scope,
         .closed = false,
         .explicit_params = false,
-        .numbered_params = false,
+        .numbered_parameters = 0,
         .transparent = true
     };
 
@@ -5822,6 +5825,18 @@ pm_parser_local_add(pm_parser_t *parser, pm_constant_id_t constant_id) {
 }
 
 /**
+ * Add a constant id to the local table of the current scope.
+ */
+static inline void
+pm_parser_numbered_parameters_set(pm_parser_t *parser, uint32_t numbered_parameters) {
+    pm_scope_t *scope = parser->current_scope;
+    while (scope && scope->transparent) scope = scope->previous;
+
+    assert(scope != NULL);
+    scope->numbered_parameters = numbered_parameters;
+}
+
+/**
  * Add a local variable from a location to the current scope.
  */
 static pm_constant_id_t
@@ -12052,9 +12067,10 @@ parse_block(pm_parser_t *parser) {
     }
 
     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);
+    return pm_block_node_create(parser, &locals, &opening, parameters, statements, &parser->previous, numbered_parameters);
 }
 
 /**
@@ -12625,9 +12641,9 @@ parse_alias_argument(pm_parser_t *parser, bool first) {
  * numbered parameters.
  */
 static bool
-outer_scope_using_numbered_params_p(pm_parser_t *parser) {
+outer_scope_using_numbered_parameters_p(pm_parser_t *parser) {
     for (pm_scope_t *scope = parser->current_scope->previous; scope != NULL && !scope->closed; scope = scope->previous) {
-        if (scope->numbered_params) return true;
+        if (scope->numbered_parameters) return true;
     }
 
     return false;
@@ -12647,25 +12663,32 @@ parse_variable_call(pm_parser_t *parser) {
         }
 
         if (!parser->current_scope->closed && pm_token_is_numbered_parameter(parser->previous.start, parser->previous.end)) {
-            // Indicate that this scope is using numbered params so that child
-            // scopes cannot.
-            parser->current_scope->numbered_params = true;
-
             // Now that we know we have a numbered parameter, we need to check
             // if it's allowed in this context. If it is, then we will create a
             // local variable read. If it's not, then we'll create a normal call
             // node but add an error.
             if (parser->current_scope->explicit_params) {
                 pm_parser_err_previous(parser, PM_ERR_NUMBERED_PARAMETER_NOT_ALLOWED);
-            } else if (outer_scope_using_numbered_params_p(parser)) {
+            } else if (outer_scope_using_numbered_parameters_p(parser)) {
                 pm_parser_err_previous(parser, PM_ERR_NUMBERED_PARAMETER_OUTER_SCOPE);
             } else {
+                // Indicate that this scope is using numbered params so that child
+                // scopes cannot.
+                uint8_t number = parser->previous.start[1];
+
+                // 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);
+                }
+
                 // When you use a numbered parameter, it implies the existence
                 // of all of the locals that exist before it. For example,
                 // referencing _2 means that _1 must exist. Therefore here we
                 // loop through all of the possibilities and add them into the
                 // constant pool.
-                uint8_t number = parser->previous.start[1];
                 uint8_t current = '1';
                 uint8_t *value;
 
@@ -15856,9 +15879,10 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power) {
             }
 
             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);
+            return (pm_node_t *) pm_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, params, body, numbered_parameters);
         }
         case PM_TOKEN_UPLUS: {
             parser_lex(parser);
diff --git a/test/prism/errors_test.rb b/test/prism/errors_test.rb
index 7292972961..871caa7475 100644
--- a/test/prism/errors_test.rb
+++ b/test/prism/errors_test.rb
@@ -452,7 +452,8 @@ module Prism
               nil,
               StatementsNode([ModuleNode([], Location(), ConstantReadNode(:Foo), nil, Location(), :Foo)]),
               Location(),
-              Location()
+              Location(),
+              0
             ),
             0
           )]
@@ -616,7 +617,8 @@ module Prism
           Location(),
           Location()
         ),
-        nil
+        nil,
+        0
       )
       assert_errors expected, "-> (a, b, ) {}", [
         ["unexpected `,` in parameters", 8..9]
@@ -992,7 +994,8 @@ module Prism
         Location(),
         Location(),
         BlockParametersNode(ParametersNode([], [], nil, [], [], ForwardingParameterNode(), nil), [], Location(), Location()),
-        nil
+        nil,
+        0
       )
 
       assert_errors expected, "->(...) {}", [
@@ -1014,7 +1017,8 @@ module Prism
           BlockParametersNode(ParametersNode([], [], nil, [], [], ForwardingParameterNode(), nil), [], Location(), Location()),
           nil,
           Location(),
-          Location()
+          Location(),
+          0
         ),
         0
       )
diff --git a/test/prism/snapshots/begin_ensure.txt b/test/prism/snapshots/begin_ensure.txt
index 14698a263e..6cf3b5558a 100644
--- a/test/prism/snapshots/begin_ensure.txt
+++ b/test/prism/snapshots/begin_ensure.txt
@@ -227,12 +227,14 @@
             │           │           │   │       │   │           │   │           │   │           │   ├── parameters: ∅
             │           │           │   │       │   │           │   │           │   │           │   ├── body: ∅
             │           │           │   │       │   │           │   │           │   │           │   ├── opening_loc: (18,22)-(18,24) = "do"
-            │           │           │   │       │   │           │   │           │   │           │   └── closing_loc: (19,4)-(19,7) = "end"
+            │           │           │   │       │   │           │   │           │   │           │   ├── closing_loc: (19,4)-(19,7) = "end"
+            │           │           │   │       │   │           │   │           │   │           │   └── numbered_parameters: 0
             │           │           │   │       │   │           │   │           │   │           └── 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"
+            │           │           │   │       │   │           │   ├── closing_loc: (21,0)-(21,3) = "end"
+            │           │           │   │       │   │           │   └── numbered_parameters: 0
             │           │           │   │       │   │           └── 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 1f4592e052..955b087ed3 100644
--- a/test/prism/snapshots/blocks.txt
+++ b/test/prism/snapshots/blocks.txt
@@ -52,7 +52,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (1,9)-(1,10) = "{"
-        │   │   └── closing_loc: (1,15)-(1,16) = "}"
+        │   │   ├── closing_loc: (1,15)-(1,16) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(5,3))
         │   ├── receiver:
@@ -103,7 +104,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (3,9)-(3,11) = "do"
-        │   │   └── closing_loc: (5,0)-(5,3) = "end"
+        │   │   ├── closing_loc: (5,0)-(5,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,35))
         │   ├── receiver:
@@ -163,7 +165,8 @@
         │   │   │           ├── operator: :+
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (7,12)-(7,13) = "{"
-        │   │   └── closing_loc: (7,34)-(7,35) = "}"
+        │   │   ├── closing_loc: (7,34)-(7,35) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,10))
         │   ├── receiver: ∅
@@ -179,7 +182,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,4)-(9,6) = "do"
-        │   │   └── closing_loc: (9,7)-(9,10) = "end"
+        │   │   ├── closing_loc: (9,7)-(9,10) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,21))
         │   ├── receiver: ∅
@@ -218,7 +222,8 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (11,14)-(11,16) = "do"
-        │   │   │       │           │   └── closing_loc: (11,17)-(11,20) = "end"
+        │   │   │       │           │   ├── closing_loc: (11,17)-(11,20) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       ├── opening_loc: (11,9)-(11,10) = "("
         │   │   │       └── closing_loc: (11,20)-(11,21) = ")"
@@ -253,7 +258,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,8)-(13,10) = "do"
-        │   │   └── closing_loc: (13,11)-(13,14) = "end"
+        │   │   ├── closing_loc: (13,11)-(13,14) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,18))
         │   ├── receiver: ∅
@@ -295,7 +301,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,12)-(15,14) = "do"
-        │   │   └── closing_loc: (15,15)-(15,18) = "end"
+        │   │   ├── closing_loc: (15,15)-(15,18) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(18,3))
         │   ├── receiver: ∅
@@ -354,7 +361,8 @@
         │   │   │   └── closing_loc: (17,16)-(17,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,4)-(17,6) = "do"
-        │   │   └── closing_loc: (18,0)-(18,3) = "end"
+        │   │   ├── closing_loc: (18,0)-(18,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (20,0)-(22,3))
         │   ├── receiver: ∅
@@ -384,7 +392,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (22,0)-(22,3) = "end"
         │   │   ├── opening_loc: (20,4)-(20,6) = "do"
-        │   │   └── closing_loc: (22,0)-(22,3) = "end"
+        │   │   ├── closing_loc: (22,0)-(22,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (24,0)-(29,3))
         │   ├── receiver: ∅
@@ -430,13 +439,16 @@
         │   │   │           │   │           │   ├── parameters: ∅
         │   │   │           │   │           │   ├── body: ∅
         │   │   │           │   │           │   ├── opening_loc: (26,8)-(26,10) = "do"
-        │   │   │           │   │           │   └── closing_loc: (27,4)-(27,7) = "end"
+        │   │   │           │   │           │   ├── closing_loc: (27,4)-(27,7) = "end"
+        │   │   │           │   │           │   └── numbered_parameters: 0
         │   │   │           │   │           └── flags: ∅
         │   │   │           │   ├── opening_loc: (25,6)-(25,8) = "do"
-        │   │   │           │   └── closing_loc: (28,2)-(28,5) = "end"
+        │   │   │           │   ├── closing_loc: (28,2)-(28,5) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (24,4)-(24,6) = "do"
-        │   │   └── closing_loc: (29,0)-(29,3) = "end"
+        │   │   ├── closing_loc: (29,0)-(29,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,16))
         │   ├── receiver:
@@ -487,7 +499,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (31,9)-(31,10) = "{"
-        │   │   └── closing_loc: (31,15)-(31,16) = "}"
+        │   │   ├── closing_loc: (31,15)-(31,16) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,24))
         │   ├── receiver: ∅
@@ -533,7 +546,8 @@
         │   │   │           ├── name: :x
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (33,4)-(33,5) = "{"
-        │   │   └── closing_loc: (33,23)-(33,24) = "}"
+        │   │   ├── closing_loc: (33,23)-(33,24) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,11))
         │   ├── receiver: ∅
@@ -564,7 +578,8 @@
         │   │   │   └── closing_loc: (35,8)-(35,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,4)-(35,5) = "{"
-        │   │   └── closing_loc: (35,10)-(35,11) = "}"
+        │   │   ├── closing_loc: (35,10)-(35,11) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ LocalVariableWriteNode (location: (37,0)-(37,8))
         │   ├── name: :fork
@@ -603,7 +618,8 @@
         │   │   │   └── closing_loc: (38,10)-(38,11) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (38,5)-(38,7) = "do"
-        │   │   └── closing_loc: (39,0)-(39,3) = "end"
+        │   │   ├── closing_loc: (39,0)-(39,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(41,12))
         │   ├── receiver: ∅
@@ -634,7 +650,8 @@
         │   │   │   └── closing_loc: (41,9)-(41,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (41,5)-(41,6) = "{"
-        │   │   └── closing_loc: (41,11)-(41,12) = "}"
+        │   │   ├── closing_loc: (41,11)-(41,12) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (43,0)-(44,3))
         │   ├── receiver: ∅
@@ -650,7 +667,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (43,2)-(43,4) = "do"
-        │   │   └── closing_loc: (44,0)-(44,3) = "end"
+        │   │   ├── closing_loc: (44,0)-(44,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (46,0)-(46,4))
         │   ├── receiver: ∅
@@ -666,7 +684,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (46,2)-(46,3) = "{"
-        │   │   └── closing_loc: (46,3)-(46,4) = "}"
+        │   │   ├── closing_loc: (46,3)-(46,4) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (48,0)-(52,1))
         │   ├── receiver: ∅
@@ -716,7 +735,8 @@
         │   │   │       │   │   └── closing_loc: (51,2)-(51,3) = "|"
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (48,11)-(48,12) = "{"
-        │   │   │       │   └── closing_loc: (52,0)-(52,1) = "}"
+        │   │   │       │   ├── closing_loc: (52,0)-(52,1) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -755,5 +775,6 @@
             │   │   └── closing_loc: (54,12)-(54,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (54,4)-(54,6) = "do"
-            │   └── closing_loc: (54,14)-(54,17) = "end"
+            │   ├── closing_loc: (54,14)-(54,17) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/break.txt b/test/prism/snapshots/break.txt
index 48991bb6eb..c89b865590 100644
--- a/test/prism/snapshots/break.txt
+++ b/test/prism/snapshots/break.txt
@@ -151,7 +151,8 @@
         │   │   │   │           │   └── flags: ∅
         │   │   │   │           └── keyword_loc: (23,6)-(23,11) = "break"
         │   │   │   ├── opening_loc: (23,4)-(23,5) = "{"
-        │   │   │   └── closing_loc: (23,15)-(23,16) = "}"
+        │   │   │   ├── closing_loc: (23,15)-(23,16) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: ∅
         │   ├── name: :==
@@ -202,7 +203,8 @@
             │   │   │           ├── arguments: ∅
             │   │   │           └── keyword_loc: (25,10)-(25,15) = "break"
             │   │   ├── opening_loc: (25,4)-(25,5) = "{"
-            │   │   └── closing_loc: (25,16)-(25,17) = "}"
+            │   │   ├── closing_loc: (25,16)-(25,17) = "}"
+            │   │   └── numbered_parameters: 0
             │   └── flags: ∅
             ├── call_operator_loc: ∅
             ├── name: :==
diff --git a/test/prism/snapshots/hashes.txt b/test/prism/snapshots/hashes.txt
index 824def5ca1..12165632c4 100644
--- a/test/prism/snapshots/hashes.txt
+++ b/test/prism/snapshots/hashes.txt
@@ -351,5 +351,6 @@
             │   │           │       └── operator_loc: ∅
             │   │           └── closing_loc: (25,19)-(25,20) = "}"
             │   ├── opening_loc: (23,4)-(23,6) = "do"
-            │   └── closing_loc: (26,0)-(26,3) = "end"
+            │   ├── closing_loc: (26,0)-(26,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/if.txt b/test/prism/snapshots/if.txt
index b48b58d1c0..ecdb1f3502 100644
--- a/test/prism/snapshots/if.txt
+++ b/test/prism/snapshots/if.txt
@@ -364,7 +364,8 @@
             │           │   │   └── closing_loc: (34,14)-(34,15) = "|"
             │           │   ├── body: ∅
             │           │   ├── opening_loc: (34,9)-(34,11) = "do"
-            │           │   └── closing_loc: (35,2)-(35,5) = "end"
+            │           │   ├── closing_loc: (35,2)-(35,5) = "end"
+            │           │   └── numbered_parameters: 0
             │           └── flags: ∅
             ├── consequent:
             │   @ IfNode (location: (36,0)-(42,3))
@@ -405,7 +406,8 @@
             │   │           │   │   └── closing_loc: (37,14)-(37,15) = "|"
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (37,9)-(37,11) = "do"
-            │   │           │   └── closing_loc: (38,2)-(38,5) = "end"
+            │   │           │   ├── closing_loc: (38,2)-(38,5) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── flags: ∅
             │   ├── consequent:
             │   │   @ ElseNode (location: (39,0)-(42,3))
@@ -442,7 +444,8 @@
             │   │   │           │   │   └── closing_loc: (40,14)-(40,15) = "|"
             │   │   │           │   ├── body: ∅
             │   │   │           │   ├── opening_loc: (40,9)-(40,11) = "do"
-            │   │   │           │   └── closing_loc: (41,2)-(41,5) = "end"
+            │   │   │           │   ├── closing_loc: (41,2)-(41,5) = "end"
+            │   │   │           │   └── numbered_parameters: 0
             │   │   │           └── 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 0714fa3d4b..c12bb2c6f3 100644
--- a/test/prism/snapshots/keyword_method_names.txt
+++ b/test/prism/snapshots/keyword_method_names.txt
@@ -61,7 +61,8 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (8,6)-(8,8) = "do"
-        │   │   │       │           │   └── closing_loc: (9,2)-(9,5) = "end"
+        │   │   │       │           │   ├── closing_loc: (9,2)-(9,5) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── 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 8e358b2709..6e35f418ca 100644
--- a/test/prism/snapshots/lambda.txt
+++ b/test/prism/snapshots/lambda.txt
@@ -24,7 +24,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (3,0)-(3,1) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (5,0)-(5,18))
         │   ├── locals: [:x]
         │   ├── operator_loc: (5,0)-(5,2) = "->"
@@ -74,7 +75,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (5,2)-(5,3) = "("
         │   │   └── closing_loc: (5,13)-(5,14) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (7,0)-(7,15))
         │   ├── locals: [:a]
         │   ├── operator_loc: (7,0)-(7,2) = "->"
@@ -123,7 +125,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (7,2)-(7,3) = "("
         │   │   └── closing_loc: (7,11)-(7,12) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (9,0)-(9,19))
         │   ├── locals: [:foo]
         │   ├── operator_loc: (9,0)-(9,2) = "->"
@@ -158,7 +161,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ LambdaNode (location: (11,0)-(11,18))
             ├── locals: [:foo]
             ├── operator_loc: (11,0)-(11,2) = "->"
@@ -192,4 +196,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/method_calls.txt b/test/prism/snapshots/method_calls.txt
index 57c233fb51..05306927d9 100644
--- a/test/prism/snapshots/method_calls.txt
+++ b/test/prism/snapshots/method_calls.txt
@@ -956,7 +956,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (64,16)-(64,18) = "do"
-        │   │   └── closing_loc: (64,33)-(64,36) = "end"
+        │   │   ├── closing_loc: (64,33)-(64,36) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (66,0)-(66,17))
         │   ├── receiver: ∅
@@ -1348,7 +1349,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (93,7)-(93,8) = "{"
-        │   │   └── closing_loc: (93,9)-(93,10) = "}"
+        │   │   ├── closing_loc: (93,9)-(93,10) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (95,0)-(95,14))
         │   ├── receiver:
@@ -1378,7 +1380,8 @@
         │   │   │       └── @ BackReferenceReadNode (location: (95,10)-(95,12))
         │   │   │           └── name: :$&
         │   │   ├── opening_loc: (95,8)-(95,9) = "{"
-        │   │   └── closing_loc: (95,13)-(95,14) = "}"
+        │   │   ├── closing_loc: (95,13)-(95,14) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (97,0)-(97,12))
         │   ├── receiver:
@@ -1462,7 +1465,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (101,14)-(101,15) = "{"
-        │   │   └── closing_loc: (101,16)-(101,17) = "}"
+        │   │   ├── closing_loc: (101,16)-(101,17) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (103,0)-(103,12))
         │   ├── receiver: ∅
@@ -1534,7 +1538,8 @@
         │   │   │               │   │       │   │   ├── parameters: ∅
         │   │   │               │   │       │   │   ├── body: ∅
         │   │   │               │   │       │   │   ├── opening_loc: (105,20)-(105,22) = "do"
-        │   │   │               │   │       │   │   └── closing_loc: (105,23)-(105,26) = "end"
+        │   │   │               │   │       │   │   ├── closing_loc: (105,23)-(105,26) = "end"
+        │   │   │               │   │       │   │   └── numbered_parameters: 0
         │   │   │               │   │       │   └── flags: ∅
         │   │   │               │   │       └── operator_loc: ∅
         │   │   │               │   └── closing_loc: (105,27)-(105,28) = "}"
@@ -1581,7 +1586,8 @@
         │   │   │               │   │       │   │   ├── parameters: ∅
         │   │   │               │   │       │   │   ├── body: ∅
         │   │   │               │   │       │   │   ├── opening_loc: (107,16)-(107,18) = "do"
-        │   │   │               │   │       │   │   └── closing_loc: (107,19)-(107,22) = "end"
+        │   │   │               │   │       │   │   ├── closing_loc: (107,19)-(107,22) = "end"
+        │   │   │               │   │       │   │   └── numbered_parameters: 0
         │   │   │               │   │       │   └── flags: ∅
         │   │   │               │   │       └── operator_loc: (107,11)-(107,13) = "**"
         │   │   │               │   └── closing_loc: (107,23)-(107,24) = "}"
@@ -1639,7 +1645,8 @@
         │   │   │       │       │           │   │           ├── closing_loc: (109,22)-(109,23) = "\""
         │   │   │       │       │           │   │           └── unescaped: "baz"
         │   │   │       │       │           │   ├── opening_loc: (109,15)-(109,17) = "do"
-        │   │   │       │       │           │   └── closing_loc: (109,24)-(109,27) = "end"
+        │   │   │       │       │           │   ├── closing_loc: (109,24)-(109,27) = "end"
+        │   │   │       │       │           │   └── numbered_parameters: 0
         │   │   │       │       │           └── flags: ∅
         │   │   │       │       └── closing_loc: (109,27)-(109,28) = "}"
         │   │   │       └── closing_loc: (109,28)-(109,29) = "\""
@@ -1651,7 +1658,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (109,30)-(109,32) = "do"
-        │   │   └── closing_loc: (109,33)-(109,36) = "end"
+        │   │   ├── closing_loc: (109,33)-(109,36) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (111,0)-(111,28))
         │   ├── receiver: ∅
@@ -1687,7 +1695,8 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (111,18)-(111,20) = "do"
-        │   │   │       │           │   └── closing_loc: (111,21)-(111,24) = "end"
+        │   │   │       │           │   ├── closing_loc: (111,21)-(111,24) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       ├── end_keyword_loc: (111,25)-(111,28) = "end"
         │   │   │       └── name: :Bar
@@ -1727,7 +1736,8 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (113,19)-(113,21) = "do"
-        │   │   │       │           │   └── closing_loc: (113,22)-(113,25) = "end"
+        │   │   │       │           │   ├── closing_loc: (113,22)-(113,25) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       ├── end_keyword_loc: (113,26)-(113,29) = "end"
         │   │   │       └── name: :Bar
@@ -1760,7 +1770,8 @@
         │   │   │       │       │   ├── parameters: ∅
         │   │   │       │       │   ├── body: ∅
         │   │   │       │       │   ├── opening_loc: (115,9)-(115,11) = "do"
-        │   │   │       │       │   └── closing_loc: (115,12)-(115,15) = "end"
+        │   │   │       │       │   ├── closing_loc: (115,12)-(115,15) = "end"
+        │   │   │       │       │   └── numbered_parameters: 0
         │   │   │       │       └── flags: ∅
         │   │   │       ├── opening_loc: (115,4)-(115,5) = "["
         │   │   │       ├── closing_loc: (115,15)-(115,16) = "]"
@@ -1803,7 +1814,8 @@
         │   │   │       │           │   │       └── @ IntegerNode (location: (117,19)-(117,20))
         │   │   │       │           │   │           └── flags: decimal
         │   │   │       │           │   ├── opening_loc: (117,16)-(117,18) = "do"
-        │   │   │       │           │   └── closing_loc: (117,21)-(117,24) = "end"
+        │   │   │       │           │   ├── closing_loc: (117,21)-(117,24) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       ├── rescue_clause: ∅
         │   │   │       ├── else_clause: ∅
@@ -1878,7 +1890,8 @@
         │   │   │       │           │   │           ├── name: :a
         │   │   │       │           │   │           └── depth: 0
         │   │   │       │           │   ├── opening_loc: (121,8)-(121,10) = "do"
-        │   │   │       │           │   └── closing_loc: (123,4)-(123,7) = "end"
+        │   │   │       │           │   ├── closing_loc: (123,4)-(123,7) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       ├── consequent: ∅
         │   │   │       └── end_keyword_loc: (124,2)-(124,5) = "end"
@@ -1951,7 +1964,8 @@
         │   │   │   │   │           │   │           ├── name: :a
         │   │   │   │   │           │   │           └── depth: 0
         │   │   │   │   │           │   ├── opening_loc: (128,8)-(128,10) = "do"
-        │   │   │   │   │           │   └── closing_loc: (130,4)-(130,7) = "end"
+        │   │   │   │   │           │   ├── closing_loc: (130,4)-(130,7) = "end"
+        │   │   │   │   │           │   └── numbered_parameters: 0
         │   │   │   │   │           └── flags: ∅
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ UntilNode (location: (132,2)-(135,5))
@@ -1985,7 +1999,8 @@
         │   │   │       │           │   ├── parameters: ∅
         │   │   │       │           │   ├── body: ∅
         │   │   │       │           │   ├── opening_loc: (133,8)-(133,10) = "do"
-        │   │   │       │           │   └── closing_loc: (134,4)-(134,7) = "end"
+        │   │   │       │           │   ├── closing_loc: (134,4)-(134,7) = "end"
+        │   │   │       │           │   └── numbered_parameters: 0
         │   │   │       │           └── flags: ∅
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
@@ -2019,7 +2034,8 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (137,7)-(137,8) = "{"
-        │   │   │       │   └── closing_loc: (137,8)-(137,9) = "}"
+        │   │   │       │   ├── closing_loc: (137,8)-(137,9) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2072,7 +2088,8 @@
         │   │   │       │   │           ├── name: :a
         │   │   │       │   │           └── depth: 0
         │   │   │       │   ├── opening_loc: (139,7)-(139,8) = "{"
-        │   │   │       │   └── closing_loc: (139,15)-(139,16) = "}"
+        │   │   │       │   ├── closing_loc: (139,15)-(139,16) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2094,7 +2111,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (141,2)-(141,3) = "{"
-        │   │   │   └── closing_loc: (141,3)-(141,4) = "}"
+        │   │   │   ├── closing_loc: (141,3)-(141,4) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: ∅
         │   ├── name: :+
@@ -2117,7 +2135,8 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (141,9)-(141,10) = "{"
-        │   │   │       │   └── closing_loc: (141,10)-(141,11) = "}"
+        │   │   │       │   ├── closing_loc: (141,10)-(141,11) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
@@ -2156,7 +2175,8 @@
         │   │   │       │   ├── parameters: ∅
         │   │   │       │   ├── body: ∅
         │   │   │       │   ├── opening_loc: (143,9)-(143,10) = "{"
-        │   │   │       │   └── closing_loc: (143,10)-(143,11) = "}"
+        │   │   │       │   ├── closing_loc: (143,10)-(143,11) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
diff --git a/test/prism/snapshots/methods.txt b/test/prism/snapshots/methods.txt
index 1341308c22..b0981f1202 100644
--- a/test/prism/snapshots/methods.txt
+++ b/test/prism/snapshots/methods.txt
@@ -1583,7 +1583,8 @@
         │   │           │   │       │   ├── parameters: ∅
         │   │           │   │       │   ├── body: ∅
         │   │           │   │       │   ├── opening_loc: (161,12)-(161,13) = "{"
-        │   │           │   │       │   └── closing_loc: (161,13)-(161,14) = "}"
+        │   │           │   │       │   ├── closing_loc: (161,13)-(161,14) = "}"
+        │   │           │   │       │   └── numbered_parameters: 0
         │   │           │   │       └── flags: ∅
         │   │           │   └── flags: ∅
         │   │           ├── closing_loc: ∅
diff --git a/test/prism/snapshots/patterns.txt b/test/prism/snapshots/patterns.txt
index 44e15fb644..dd5884bf51 100644
--- a/test/prism/snapshots/patterns.txt
+++ b/test/prism/snapshots/patterns.txt
@@ -485,12 +485,13 @@
         │   │   ├── 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
+        │   │   ├── body:
+        │   │   │   @ StatementsNode (location: (26,12)-(26,15))
+        │   │   │   └── body: (length: 1)
+        │   │   │       └── @ LocalVariableReadNode (location: (26,12)-(26,15))
+        │   │   │           ├── name: :bar
+        │   │   │           └── depth: 1
+        │   │   └── numbered_parameters: 0
         │   └── operator_loc: (26,4)-(26,6) = "=>"
         ├── @ MatchRequiredNode (location: (28,0)-(28,13))
         │   ├── value:
@@ -1189,12 +1190,13 @@
         │   │   │   ├── 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
+        │   │   │   ├── body:
+        │   │   │   │   @ StatementsNode (location: (52,12)-(52,15))
+        │   │   │   │   └── body: (length: 1)
+        │   │   │   │       └── @ LocalVariableReadNode (location: (52,12)-(52,15))
+        │   │   │   │           ├── name: :bar
+        │   │   │   │           └── depth: 1
+        │   │   │   └── numbered_parameters: 0
         │   │   ├── right:
         │   │   │   @ LambdaNode (location: (52,21)-(52,31))
         │   │   │   ├── locals: []
@@ -1202,12 +1204,13 @@
         │   │   │   ├── 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
+        │   │   │   ├── body:
+        │   │   │   │   @ StatementsNode (location: (52,26)-(52,29))
+        │   │   │   │   └── body: (length: 1)
+        │   │   │   │       └── @ LocalVariableReadNode (location: (52,26)-(52,29))
+        │   │   │   │           ├── name: :bar
+        │   │   │   │           └── depth: 1
+        │   │   │   └── numbered_parameters: 0
         │   │   ├── operator_loc: (52,18)-(52,20) = ".."
         │   │   └── flags: ∅
         │   └── operator_loc: (52,4)-(52,6) = "=>"
@@ -2787,12 +2790,13 @@
         │   │   ├── 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
+        │   │   ├── body:
+        │   │   │   @ StatementsNode (location: (125,12)-(125,15))
+        │   │   │   └── body: (length: 1)
+        │   │   │       └── @ LocalVariableReadNode (location: (125,12)-(125,15))
+        │   │   │           ├── name: :bar
+        │   │   │           └── depth: 1
+        │   │   └── numbered_parameters: 0
         │   └── operator_loc: (125,4)-(125,6) = "in"
         ├── @ CaseMatchNode (location: (127,0)-(127,25))
         │   ├── predicate:
@@ -3453,12 +3457,13 @@
         │   │       │   ├── 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
+        │   │       │   ├── body:
+        │   │       │   │   @ StatementsNode (location: (152,18)-(152,21))
+        │   │       │   │   └── body: (length: 1)
+        │   │       │   │       └── @ LocalVariableReadNode (location: (152,18)-(152,21))
+        │   │       │   │           ├── name: :bar
+        │   │       │   │           └── depth: 1
+        │   │       │   └── numbered_parameters: 0
         │   │       ├── statements: ∅
         │   │       ├── in_loc: (152,10)-(152,12) = "in"
         │   │       └── then_loc: (152,24)-(152,28) = "then"
@@ -4434,12 +4439,13 @@
         │   │       │   │           ├── 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
+        │   │       │   │           ├── body:
+        │   │       │   │           │   @ StatementsNode (location: (179,18)-(179,21))
+        │   │       │   │           │   └── body: (length: 1)
+        │   │       │   │           │       └── @ LocalVariableReadNode (location: (179,18)-(179,21))
+        │   │       │   │           │           ├── name: :bar
+        │   │       │   │           │           └── depth: 1
+        │   │       │   │           └── numbered_parameters: 0
         │   │       │   ├── consequent: ∅
         │   │       │   └── end_keyword_loc: ∅
         │   │       ├── statements: ∅
@@ -4674,5 +4680,6 @@
             │   │           │   └── 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"
+            │   ├── closing_loc: (200,0)-(200,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/procs.txt b/test/prism/snapshots/procs.txt
index 25783cfb34..6af836e830 100644
--- a/test/prism/snapshots/procs.txt
+++ b/test/prism/snapshots/procs.txt
@@ -30,97 +30,102 @@
         │   │   │       └── 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
+        │   ├── body:
+        │   │   @ StatementsNode (location: (1,18)-(1,19))
+        │   │   └── body: (length: 1)
+        │   │       └── @ LocalVariableReadNode (location: (1,18)-(1,19))
+        │   │           ├── name: :b
+        │   │           └── depth: 0
+        │   └── numbered_parameters: 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"
+        │   ├── 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
         ├── @ 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"
+        │   ├── 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
         ├── @ 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
+        │   ├── 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
         ├── @ 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
+        │   ├── 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
         ├── @ LambdaNode (location: (17,0)-(17,29))
         │   ├── locals: [:a, :b, :c, :d, :e]
         │   ├── operator_loc: (17,0)-(17,2) = "->"
@@ -159,12 +164,13 @@
         │   │   ├── 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
+        │   ├── body:
+        │   │   @ StatementsNode (location: (17,26)-(17,27))
+        │   │   └── body: (length: 1)
+        │   │       └── @ LocalVariableReadNode (location: (17,26)-(17,27))
+        │   │           ├── name: :a
+        │   │           └── depth: 0
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (19,0)-(19,40))
         │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
         │   ├── operator_loc: (19,0)-(19,2) = "->"
@@ -211,12 +217,13 @@
         │   │   ├── 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
+        │   ├── body:
+        │   │   @ StatementsNode (location: (19,37)-(19,38))
+        │   │   └── body: (length: 1)
+        │   │       └── @ LocalVariableReadNode (location: (19,37)-(19,38))
+        │   │           ├── name: :a
+        │   │           └── depth: 0
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (21,0)-(23,3))
         │   ├── locals: [:a, :b, :c, :d, :e, :f, :g]
         │   ├── operator_loc: (21,0)-(21,2) = "->"
@@ -263,12 +270,13 @@
         │   │   ├── 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
+        │   ├── body:
+        │   │   @ StatementsNode (location: (22,2)-(22,3))
+        │   │   └── body: (length: 1)
+        │   │       └── @ LocalVariableReadNode (location: (22,2)-(22,3))
+        │   │           ├── name: :a
+        │   │           └── depth: 0
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (25,0)-(25,25))
         │   ├── locals: [:a]
         │   ├── operator_loc: (25,0)-(25,2) = "->"
@@ -290,52 +298,54 @@
         │   │   ├── 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: ∅
+        │   ├── 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
         └── @ LambdaNode (location: (27,0)-(27,19))
             ├── locals: [:a, :b, :c]
             ├── operator_loc: (27,0)-(27,2) = "->"
@@ -369,4 +379,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (27,3)-(27,4) = "("
             │   └── closing_loc: (27,14)-(27,15) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/regex.txt b/test/prism/snapshots/regex.txt
index 3b6ed09c53..2c32ffb4bc 100644
--- a/test/prism/snapshots/regex.txt
+++ b/test/prism/snapshots/regex.txt
@@ -366,5 +366,6 @@
             │   │                   ├── name: :a
             │   │                   └── depth: 1
             │   ├── opening_loc: (40,4)-(40,5) = "{"
-            │   └── closing_loc: (40,23)-(40,24) = "}"
+            │   ├── closing_loc: (40,23)-(40,24) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/rescue.txt b/test/prism/snapshots/rescue.txt
index 4537d911cf..1bca3164d7 100644
--- a/test/prism/snapshots/rescue.txt
+++ b/test/prism/snapshots/rescue.txt
@@ -241,7 +241,8 @@
         │   │   │               ├── block: ∅
         │   │   │               └── flags: ∅
         │   │   ├── opening_loc: (18,4)-(18,6) = "do"
-        │   │   └── closing_loc: (20,0)-(20,3) = "end"
+        │   │   ├── closing_loc: (20,0)-(20,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── 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 054e43754a..29388b6c52 100644
--- a/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_kwsplat.txt
@@ -34,5 +34,6 @@
             │   │   └── closing_loc: (1,8)-(1,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,10)-(1,11) = "}"
+            │   ├── closing_loc: (1,10)-(1,11) = "}"
+            │   └── numbered_parameters: 0
             └── 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 2731158862..8de2bdbb16 100644
--- a/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_opt_arg_block.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,20)-(1,21) = "}"
+            │   ├── closing_loc: (1,20)-(1,21) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt b/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
index 94b9fa4f01..62d23890f4 100644
--- a/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_opt_splat.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,19)-(1,20) = "}"
+            │   ├── closing_loc: (1,19)-(1,20) = "}"
+            │   └── numbered_parameters: 0
             └── 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 5e362a1019..ac9a37289f 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,5 +49,6 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,24)-(1,25) = "}"
+            │   ├── closing_loc: (1,24)-(1,25) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_optional.txt b/test/prism/snapshots/seattlerb/block_arg_optional.txt
index f95c7aebaa..069c925a20 100644
--- a/test/prism/snapshots/seattlerb/block_arg_optional.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_optional.txt
@@ -37,5 +37,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_scope.txt b/test/prism/snapshots/seattlerb/block_arg_scope.txt
index 1c060378ca..2674541c81 100644
--- a/test/prism/snapshots/seattlerb/block_arg_scope.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_scope.txt
@@ -34,5 +34,6 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,11)-(1,12) = "}"
+            │   ├── closing_loc: (1,11)-(1,12) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_scope2.txt b/test/prism/snapshots/seattlerb/block_arg_scope2.txt
index 9d8da491ec..4203c79ebc 100644
--- a/test/prism/snapshots/seattlerb/block_arg_scope2.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_scope2.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt b/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
index aad8a88607..697637998e 100644
--- a/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_arg_splat_arg.txt
@@ -38,5 +38,6 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,15)-(1,16) = "}"
+            │   ├── closing_loc: (1,15)-(1,16) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_kwargs.txt b/test/prism/snapshots/seattlerb/block_args_kwargs.txt
index 484c64bc36..25ba958ed8 100644
--- a/test/prism/snapshots/seattlerb/block_args_kwargs.txt
+++ b/test/prism/snapshots/seattlerb/block_args_kwargs.txt
@@ -39,5 +39,6 @@
             │   │           ├── name: :kwargs
             │   │           └── depth: 0
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,22)-(1,23) = "}"
+            │   ├── closing_loc: (1,22)-(1,23) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt b/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
index bec50cfb2a..4417158922 100644
--- a/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
+++ b/test/prism/snapshots/seattlerb/block_args_no_kwargs.txt
@@ -33,5 +33,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt1.txt b/test/prism/snapshots/seattlerb/block_args_opt1.txt
index c2cfae78c8..15d8c1d51d 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt1.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt1.txt
@@ -52,5 +52,6 @@
             │   │           ├── closing_loc: (1,21)-(1,22) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,23)-(1,24) = "}"
+            │   ├── closing_loc: (1,23)-(1,24) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt2.txt b/test/prism/snapshots/seattlerb/block_args_opt2.txt
index 1ec66cb9fa..5695a2351a 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt2.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt2.txt
@@ -44,5 +44,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt2_2.txt b/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
index e6722c5e65..47f096a6d4 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt2_2.txt
@@ -62,5 +62,6 @@
             │   │           ├── closing_loc: (1,32)-(1,33) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,34)-(1,35) = "}"
+            │   ├── closing_loc: (1,34)-(1,35) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_args_opt3.txt b/test/prism/snapshots/seattlerb/block_args_opt3.txt
index 0cdfa0bf8e..1d9e58bb2f 100644
--- a/test/prism/snapshots/seattlerb/block_args_opt3.txt
+++ b/test/prism/snapshots/seattlerb/block_args_opt3.txt
@@ -69,5 +69,6 @@
             │   │           ├── closing_loc: (1,39)-(1,40) = "]"
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,41)-(1,42) = "}"
+            │   ├── closing_loc: (1,41)-(1,42) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_break.txt b/test/prism/snapshots/seattlerb/block_break.txt
index 9187ab3524..9b48681285 100644
--- a/test/prism/snapshots/seattlerb/block_break.txt
+++ b/test/prism/snapshots/seattlerb/block_break.txt
@@ -49,7 +49,8 @@
             │   │       │   │   └── closing_loc: (1,21)-(1,22) = "|"
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │       │   └── closing_loc: (1,23)-(1,26) = "end"
+            │   │       │   ├── closing_loc: (1,23)-(1,26) = "end"
+            │   │       │   └── numbered_parameters: 0
             │   │       └── 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 9a6ac52537..671ab223b9 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,5 +75,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (4,5)-(4,7) = "do"
-            │   └── closing_loc: (4,8)-(4,11) = "end"
+            │   ├── closing_loc: (4,8)-(4,11) = "end"
+            │   └── numbered_parameters: 0
             └── 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 981b56eed5..09115a5f07 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,7 +54,8 @@
             │   │   │           ├── block: ∅
             │   │   │           └── flags: variable_call
             │   │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   │   └── closing_loc: (1,13)-(1,16) = "end"
+            │   │   ├── closing_loc: (1,13)-(1,16) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── flags: ∅
             ├── call_operator_loc: (1,16)-(1,17) = "."
             ├── name: :e
@@ -95,5 +96,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,19)-(1,21) = "do"
-            │   └── closing_loc: (1,28)-(1,31) = "end"
+            │   ├── closing_loc: (1,28)-(1,31) = "end"
+            │   └── numbered_parameters: 0
             └── 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 92a264fff3..5e969f3a9b 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,7 +54,8 @@
             │   │   │           ├── block: ∅
             │   │   │           └── flags: variable_call
             │   │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   │   └── closing_loc: (1,13)-(1,16) = "end"
+            │   │   ├── closing_loc: (1,13)-(1,16) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── flags: ∅
             ├── call_operator_loc: (1,16)-(1,17) = "."
             ├── name: :e
@@ -108,5 +109,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,21)-(1,23) = "do"
-            │   └── closing_loc: (1,30)-(1,33) = "end"
+            │   ├── closing_loc: (1,30)-(1,33) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_call_operation_colon.txt b/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
index 35029c74c3..14c06592a2 100644
--- a/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
+++ b/test/prism/snapshots/seattlerb/block_call_operation_colon.txt
@@ -42,7 +42,8 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,6)-(1,8) = "do"
-            │   │   └── closing_loc: (1,9)-(1,12) = "end"
+            │   │   ├── closing_loc: (1,9)-(1,12) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 85ad62fca7..3ee42baa1b 100644
--- a/test/prism/snapshots/seattlerb/block_call_operation_dot.txt
+++ b/test/prism/snapshots/seattlerb/block_call_operation_dot.txt
@@ -42,7 +42,8 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,6)-(1,8) = "do"
-            │   │   └── closing_loc: (1,9)-(1,12) = "end"
+            │   │   ├── closing_loc: (1,9)-(1,12) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 08adde5fd8..b75bc8ee71 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,5 +56,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   └── closing_loc: (2,7)-(2,10) = "end"
+            │   ├── closing_loc: (2,7)-(2,10) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_command_operation_colon.txt b/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
index 5537ba25a7..0685638b43 100644
--- a/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
+++ b/test/prism/snapshots/seattlerb/block_command_operation_colon.txt
@@ -27,7 +27,8 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   │   └── closing_loc: (1,8)-(1,11) = "end"
+            │   │   ├── closing_loc: (1,8)-(1,11) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 13589d2262..1be09de692 100644
--- a/test/prism/snapshots/seattlerb/block_command_operation_dot.txt
+++ b/test/prism/snapshots/seattlerb/block_command_operation_dot.txt
@@ -27,7 +27,8 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   │   └── closing_loc: (1,8)-(1,11) = "end"
+            │   │   ├── closing_loc: (1,8)-(1,11) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 f50df15dc7..0fa38bca2d 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_anon_splat_arg.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt b/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
index 74a3902c1a..01fb9c9795 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_arg_splat.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── 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 caeda850b0..4c1a9976bf 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_arg_splat_arg.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_decomp_splat.txt b/test/prism/snapshots/seattlerb/block_decomp_splat.txt
index 4335b5f4ac..c3f5e7de61 100644
--- a/test/prism/snapshots/seattlerb/block_decomp_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_decomp_splat.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,11)-(1,12) = "}"
+            │   ├── closing_loc: (1,11)-(1,12) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kw.txt b/test/prism/snapshots/seattlerb/block_kw.txt
index 1ace3d9389..9a5bf2b714 100644
--- a/test/prism/snapshots/seattlerb/block_kw.txt
+++ b/test/prism/snapshots/seattlerb/block_kw.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   └── closing_loc: (1,14)-(1,15) = "}"
+            │   ├── closing_loc: (1,14)-(1,15) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kw__required.txt b/test/prism/snapshots/seattlerb/block_kw__required.txt
index f1b40925fe..c7ea062f7f 100644
--- a/test/prism/snapshots/seattlerb/block_kw__required.txt
+++ b/test/prism/snapshots/seattlerb/block_kw__required.txt
@@ -33,5 +33,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   └── closing_loc: (1,13)-(1,16) = "end"
+            │   ├── closing_loc: (1,13)-(1,16) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt b/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
index ce495a7a7e..a07f0128fc 100644
--- a/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
+++ b/test/prism/snapshots/seattlerb/block_kwarg_lvar.txt
@@ -44,5 +44,6 @@
             │   │           ├── name: :kw
             │   │           └── depth: 0
             │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   └── closing_loc: (1,19)-(1,20) = "}"
+            │   ├── closing_loc: (1,19)-(1,20) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt b/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
index 3bf3b252f1..25e2926ca3 100644
--- a/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
+++ b/test/prism/snapshots/seattlerb/block_kwarg_lvar_multiple.txt
@@ -53,5 +53,6 @@
             │   │           ├── name: :kw
             │   │           └── depth: 0
             │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   └── closing_loc: (1,32)-(1,33) = "}"
+            │   ├── closing_loc: (1,32)-(1,33) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_next.txt b/test/prism/snapshots/seattlerb/block_next.txt
index 4fde9c7300..8860716914 100644
--- a/test/prism/snapshots/seattlerb/block_next.txt
+++ b/test/prism/snapshots/seattlerb/block_next.txt
@@ -49,7 +49,8 @@
             │   │       │   │   └── closing_loc: (1,20)-(1,21) = "|"
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │       │   └── closing_loc: (1,22)-(1,25) = "end"
+            │   │       │   ├── closing_loc: (1,22)-(1,25) = "end"
+            │   │       │   └── numbered_parameters: 0
             │   │       └── 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 4e3863c1d0..e2a9218b22 100644
--- a/test/prism/snapshots/seattlerb/block_opt_arg.txt
+++ b/test/prism/snapshots/seattlerb/block_opt_arg.txt
@@ -39,5 +39,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_opt_splat.txt b/test/prism/snapshots/seattlerb/block_opt_splat.txt
index 54009f2e0f..de85831d97 100644
--- a/test/prism/snapshots/seattlerb/block_opt_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_opt_splat.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── 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 a1cccaf42a..56e9c30d28 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,5 +47,6 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,21)-(1,22) = "}"
+            │   ├── closing_loc: (1,21)-(1,22) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_optarg.txt b/test/prism/snapshots/seattlerb/block_optarg.txt
index 6a22978ec9..6a39de0dc9 100644
--- a/test/prism/snapshots/seattlerb/block_optarg.txt
+++ b/test/prism/snapshots/seattlerb/block_optarg.txt
@@ -40,5 +40,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_paren_splat.txt b/test/prism/snapshots/seattlerb/block_paren_splat.txt
index 04987521fe..81169108e2 100644
--- a/test/prism/snapshots/seattlerb/block_paren_splat.txt
+++ b/test/prism/snapshots/seattlerb/block_paren_splat.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,14)-(1,15) = "}"
+            │   ├── closing_loc: (1,14)-(1,15) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_reg_optarg.txt b/test/prism/snapshots/seattlerb/block_reg_optarg.txt
index e9ad2f1a6a..b81b299ced 100644
--- a/test/prism/snapshots/seattlerb/block_reg_optarg.txt
+++ b/test/prism/snapshots/seattlerb/block_reg_optarg.txt
@@ -42,5 +42,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_return.txt b/test/prism/snapshots/seattlerb/block_return.txt
index 858e1a9de4..c9f9a42f72 100644
--- a/test/prism/snapshots/seattlerb/block_return.txt
+++ b/test/prism/snapshots/seattlerb/block_return.txt
@@ -50,6 +50,7 @@
                 │       │   │   └── closing_loc: (1,22)-(1,23) = "|"
                 │       │   ├── body: ∅
                 │       │   ├── opening_loc: (1,15)-(1,17) = "do"
-                │       │   └── closing_loc: (1,24)-(1,27) = "end"
+                │       │   ├── closing_loc: (1,24)-(1,27) = "end"
+                │       │   └── numbered_parameters: 0
                 │       └── flags: ∅
                 └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_scope.txt b/test/prism/snapshots/seattlerb/block_scope.txt
index 3a2e23d27f..ef7117bcfd 100644
--- a/test/prism/snapshots/seattlerb/block_scope.txt
+++ b/test/prism/snapshots/seattlerb/block_scope.txt
@@ -24,5 +24,6 @@
             │   │   └── closing_loc: (1,7)-(1,8) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,9)-(1,10) = "}"
+            │   ├── closing_loc: (1,9)-(1,10) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/block_splat_reg.txt b/test/prism/snapshots/seattlerb/block_splat_reg.txt
index 5f7d263def..e685bd0264 100644
--- a/test/prism/snapshots/seattlerb/block_splat_reg.txt
+++ b/test/prism/snapshots/seattlerb/block_splat_reg.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug169.txt b/test/prism/snapshots/seattlerb/bug169.txt
index 901778c873..901792e094 100644
--- a/test/prism/snapshots/seattlerb/bug169.txt
+++ b/test/prism/snapshots/seattlerb/bug169.txt
@@ -24,5 +24,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,6) = "{"
-            │   └── closing_loc: (1,6)-(1,7) = "}"
+            │   ├── closing_loc: (1,6)-(1,7) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug236.txt b/test/prism/snapshots/seattlerb/bug236.txt
index 8dc96d2292..0d9427bfff 100644
--- a/test/prism/snapshots/seattlerb/bug236.txt
+++ b/test/prism/snapshots/seattlerb/bug236.txt
@@ -36,7 +36,8 @@
         │   │   │   └── closing_loc: (1,5)-(1,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,1)-(1,2) = "{"
-        │   │   └── closing_loc: (1,6)-(1,7) = "}"
+        │   │   ├── closing_loc: (1,6)-(1,7) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,6))
             ├── receiver: ∅
@@ -67,5 +68,6 @@
             │   │   └── closing_loc: (3,4)-(3,5) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (3,1)-(3,2) = "{"
-            │   └── closing_loc: (3,5)-(3,6) = "}"
+            │   ├── closing_loc: (3,5)-(3,6) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_187.txt b/test/prism/snapshots/seattlerb/bug_187.txt
index 83c443c7c2..5c3fc886d6 100644
--- a/test/prism/snapshots/seattlerb/bug_187.txt
+++ b/test/prism/snapshots/seattlerb/bug_187.txt
@@ -44,7 +44,8 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   │       │           │   └── closing_loc: (2,7)-(2,10) = "end"
+            │   │       │           │   ├── closing_loc: (2,7)-(2,10) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── 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 720c4d16f2..b064cd8817 100644
--- a/test/prism/snapshots/seattlerb/bug_249.txt
+++ b/test/prism/snapshots/seattlerb/bug_249.txt
@@ -49,7 +49,8 @@
             │   │   │   │   │           │   │           ├── equal_loc: ∅
             │   │   │   │   │           │   │           └── end_keyword_loc: (3,0)-(3,3) = "end"
             │   │   │   │   │           │   ├── opening_loc: (1,17)-(1,19) = "do"
-            │   │   │   │   │           │   └── closing_loc: (4,1)-(4,4) = "end"
+            │   │   │   │   │           │   ├── closing_loc: (4,1)-(4,4) = "end"
+            │   │   │   │   │           │   └── numbered_parameters: 0
             │   │   │   │   │           └── 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 f4cf106679..56214d6ffc 100644
--- a/test/prism/snapshots/seattlerb/bug_args__19.txt
+++ b/test/prism/snapshots/seattlerb/bug_args__19.txt
@@ -52,5 +52,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,15)-(1,16) = "}"
+            │   ├── closing_loc: (1,15)-(1,16) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_args_masgn.txt b/test/prism/snapshots/seattlerb/bug_args_masgn.txt
index ba00a0c0e2..dd79941f72 100644
--- a/test/prism/snapshots/seattlerb/bug_args_masgn.txt
+++ b/test/prism/snapshots/seattlerb/bug_args_masgn.txt
@@ -42,5 +42,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_args_masgn2.txt b/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
index f417b7e040..ce5982c00d 100644
--- a/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
+++ b/test/prism/snapshots/seattlerb/bug_args_masgn2.txt
@@ -50,5 +50,6 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,21)-(1,22) = "}"
+            │   ├── closing_loc: (1,21)-(1,22) = "}"
+            │   └── numbered_parameters: 0
             └── 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 8554ec03d0..9456c0e95e 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,5 +48,6 @@
             │   │   └── closing_loc: (1,16)-(1,17) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,18)-(1,19) = "}"
+            │   ├── closing_loc: (1,18)-(1,19) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/bug_masgn_right.txt b/test/prism/snapshots/seattlerb/bug_masgn_right.txt
index fba08a0260..e9d8d1b945 100644
--- a/test/prism/snapshots/seattlerb/bug_masgn_right.txt
+++ b/test/prism/snapshots/seattlerb/bug_masgn_right.txt
@@ -42,5 +42,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/call_array_block_call.txt b/test/prism/snapshots/seattlerb/call_array_block_call.txt
index b5705817ac..ef78bbe85c 100644
--- a/test/prism/snapshots/seattlerb/call_array_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_array_block_call.txt
@@ -29,7 +29,8 @@
             │   │       │       │   ├── parameters: ∅
             │   │       │       │   ├── body: ∅
             │   │       │       │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   │       │       │   └── closing_loc: (1,14)-(1,17) = "end"
+            │   │       │       │   ├── closing_loc: (1,14)-(1,17) = "end"
+            │   │       │       │   └── numbered_parameters: 0
             │   │       │       └── 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 92f98926f6..b7bb7427c6 100644
--- a/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_array_lambda_block_call.txt
@@ -25,7 +25,8 @@
             │   │       │       │   ├── locals: (length: 0)
             │   │       │       │   ├── opening_loc: (1,5)-(1,6) = "("
             │   │       │       │   └── closing_loc: (1,6)-(1,7) = ")"
-            │   │       │       └── body: ∅
+            │   │       │       ├── body: ∅
+            │   │       │       └── numbered_parameters: 0
             │   │       ├── opening_loc: (1,2)-(1,3) = "["
             │   │       ├── closing_loc: (1,10)-(1,11) = "]"
             │   │       └── flags: ∅
@@ -37,5 +38,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,12)-(1,14) = "do"
-            │   └── closing_loc: (2,0)-(2,3) = "end"
+            │   ├── closing_loc: (2,0)-(2,3) = "end"
+            │   └── numbered_parameters: 0
             └── 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 ac3bccb3f6..0ad9064b0c 100644
--- a/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt
+++ b/test/prism/snapshots/seattlerb/call_begin_call_block_call.txt
@@ -41,7 +41,8 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   │       │           │   └── closing_loc: (2,7)-(2,10) = "end"
+            │   │       │           │   ├── closing_loc: (2,7)-(2,10) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── 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 9d94a45e5d..9ecc0426b2 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,11 +18,12 @@
             │   │       ├── 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
+            │   │       ├── body:
+            │   │       │   @ StatementsNode (location: (1,8)-(1,9))
+            │   │       │   └── body: (length: 1)
+            │   │       │       └── @ IntegerNode (location: (1,8)-(1,9))
+            │   │       │           └── flags: decimal
+            │   │       └── numbered_parameters: 0
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block:
@@ -35,5 +36,6 @@
             │   │       └── @ IntegerNode (location: (1,17)-(1,18))
             │   │           └── flags: decimal
             │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   └── closing_loc: (1,19)-(1,22) = "end"
+            │   ├── closing_loc: (1,19)-(1,22) = "end"
+            │   └── numbered_parameters: 0
             └── 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 c641ccdeeb..102a451c35 100644
--- a/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
+++ b/test/prism/snapshots/seattlerb/call_stabby_with_braces_block.txt
@@ -18,11 +18,12 @@
             │   │       ├── 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
+            │   │       ├── body:
+            │   │       │   @ StatementsNode (location: (1,7)-(1,8))
+            │   │       │   └── body: (length: 1)
+            │   │       │       └── @ IntegerNode (location: (1,7)-(1,8))
+            │   │       │           └── flags: decimal
+            │   │       └── numbered_parameters: 0
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block:
@@ -35,5 +36,6 @@
             │   │       └── @ IntegerNode (location: (1,14)-(1,15))
             │   │           └── flags: decimal
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   └── closing_loc: (1,16)-(1,19) = "end"
+            │   ├── closing_loc: (1,16)-(1,19) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/case_in.txt b/test/prism/snapshots/seattlerb/case_in.txt
index 793448fb7a..0000aa064d 100644
--- a/test/prism/snapshots/seattlerb/case_in.txt
+++ b/test/prism/snapshots/seattlerb/case_in.txt
@@ -539,10 +539,11 @@
         │   │       │   │   │   │   ├── 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))
+        │   │       │   │   │   ├── body:
+        │   │       │   │   │   │   @ StatementsNode (location: (70,12)-(70,16))
+        │   │       │   │   │   │   └── body: (length: 1)
+        │   │       │   │   │   │       └── @ TrueNode (location: (70,12)-(70,16))
+        │   │       │   │   │   └── numbered_parameters: 0
         │   │       │   │   └── @ 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 34540783fc..e78ada28c2 100644
--- a/test/prism/snapshots/seattlerb/dasgn_icky2.txt
+++ b/test/prism/snapshots/seattlerb/dasgn_icky2.txt
@@ -57,5 +57,6 @@
             │   │           ├── ensure_clause: ∅
             │   │           └── end_keyword_loc: (7,2)-(7,5) = "end"
             │   ├── opening_loc: (1,2)-(1,4) = "do"
-            │   └── closing_loc: (8,0)-(8,3) = "end"
+            │   ├── closing_loc: (8,0)-(8,3) = "end"
+            │   └── numbered_parameters: 0
             └── 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 118db362cb..baaea40244 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,7 +45,8 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,18)-(1,20) = "do"
-            │   │       │           │   └── closing_loc: (1,22)-(1,25) = "end"
+            │   │       │           │   ├── closing_loc: (1,22)-(1,25) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── 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 3f2b0545dc..8ac226b572 100644
--- a/test/prism/snapshots/seattlerb/difficult3_.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_2.txt b/test/prism/snapshots/seattlerb/difficult3_2.txt
index 1352705188..c415b79b34 100644
--- a/test/prism/snapshots/seattlerb/difficult3_2.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_2.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_3.txt b/test/prism/snapshots/seattlerb/difficult3_3.txt
index 04207aad7a..13ea75ceea 100644
--- a/test/prism/snapshots/seattlerb/difficult3_3.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_3.txt
@@ -40,5 +40,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3_5.txt b/test/prism/snapshots/seattlerb/difficult3_5.txt
index d446ac88b0..5326e818e5 100644
--- a/test/prism/snapshots/seattlerb/difficult3_5.txt
+++ b/test/prism/snapshots/seattlerb/difficult3_5.txt
@@ -23,25 +23,27 @@
             │   │       │   ├── 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"
-            │   │                   └── flags: ∅
+            │   │       ├── 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
             │   └── flags: ∅
             ├── closing_loc: ∅
             ├── block: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__10.txt b/test/prism/snapshots/seattlerb/difficult3__10.txt
index eabf92f1f4..4bd146e7a3 100644
--- a/test/prism/snapshots/seattlerb/difficult3__10.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__10.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__11.txt b/test/prism/snapshots/seattlerb/difficult3__11.txt
index 16e2bd68b1..ab92f6d6ce 100644
--- a/test/prism/snapshots/seattlerb/difficult3__11.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__11.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__12.txt b/test/prism/snapshots/seattlerb/difficult3__12.txt
index 072b3fb130..6e96ef63eb 100644
--- a/test/prism/snapshots/seattlerb/difficult3__12.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__12.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__6.txt b/test/prism/snapshots/seattlerb/difficult3__6.txt
index 2afabb3bb1..09efc1bf6d 100644
--- a/test/prism/snapshots/seattlerb/difficult3__6.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__6.txt
@@ -47,5 +47,6 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,20)-(1,21) = "}"
+            │   ├── closing_loc: (1,20)-(1,21) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__7.txt b/test/prism/snapshots/seattlerb/difficult3__7.txt
index c44ed91659..ef8732aa5b 100644
--- a/test/prism/snapshots/seattlerb/difficult3__7.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__7.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__8.txt b/test/prism/snapshots/seattlerb/difficult3__8.txt
index fe6e57b9e5..294530d34a 100644
--- a/test/prism/snapshots/seattlerb/difficult3__8.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__8.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,19)-(1,20) = "}"
+            │   ├── closing_loc: (1,19)-(1,20) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult3__9.txt b/test/prism/snapshots/seattlerb/difficult3__9.txt
index 313eac0f2c..e05788f406 100644
--- a/test/prism/snapshots/seattlerb/difficult3__9.txt
+++ b/test/prism/snapshots/seattlerb/difficult3__9.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,12)-(1,13) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,14)-(1,15) = "}"
+            │   ├── closing_loc: (1,14)-(1,15) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult6_.txt b/test/prism/snapshots/seattlerb/difficult6_.txt
index 3c2c093bad..fd8b49f94a 100644
--- a/test/prism/snapshots/seattlerb/difficult6_.txt
+++ b/test/prism/snapshots/seattlerb/difficult6_.txt
@@ -30,30 +30,31 @@
             │   ├── 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: ∅
+            ├── 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
diff --git a/test/prism/snapshots/seattlerb/difficult6__7.txt b/test/prism/snapshots/seattlerb/difficult6__7.txt
index 2b8bf58ae0..4a374b95e1 100644
--- a/test/prism/snapshots/seattlerb/difficult6__7.txt
+++ b/test/prism/snapshots/seattlerb/difficult6__7.txt
@@ -50,5 +50,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,8)-(1,9) = "{"
-            │   └── closing_loc: (1,10)-(1,11) = "}"
+            │   ├── closing_loc: (1,10)-(1,11) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult6__8.txt b/test/prism/snapshots/seattlerb/difficult6__8.txt
index 88f0436a72..041e6ca09d 100644
--- a/test/prism/snapshots/seattlerb/difficult6__8.txt
+++ b/test/prism/snapshots/seattlerb/difficult6__8.txt
@@ -50,5 +50,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   └── closing_loc: (1,11)-(1,12) = "}"
+            │   ├── closing_loc: (1,11)-(1,12) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/difficult7_.txt b/test/prism/snapshots/seattlerb/difficult7_.txt
index 5650727fad..4e41e06c50 100644
--- a/test/prism/snapshots/seattlerb/difficult7_.txt
+++ b/test/prism/snapshots/seattlerb/difficult7_.txt
@@ -75,7 +75,8 @@
             │   │   │   │   │           │   └── end_keyword_loc: ∅
             │   │   │   │   │           └── end_keyword_loc: ∅
             │   │   │   │   ├── opening_loc: (2,18)-(2,19) = "{"
-            │   │   │   │   └── closing_loc: (2,32)-(2,33) = "}"
+            │   │   │   │   ├── closing_loc: (2,32)-(2,33) = "}"
+            │   │   │   │   └── numbered_parameters: 0
             │   │   │   └── 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 14c707055f..245baea629 100644
--- a/test/prism/snapshots/seattlerb/do_bug.txt
+++ b/test/prism/snapshots/seattlerb/do_bug.txt
@@ -57,5 +57,6 @@
             │   │   └── closing_loc: (2,9)-(2,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (2,4)-(2,6) = "do"
-            │   └── closing_loc: (4,0)-(4,3) = "end"
+            │   ├── closing_loc: (4,0)-(4,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/do_lambda.txt b/test/prism/snapshots/seattlerb/do_lambda.txt
index 4713fb3e4b..3ef5303475 100644
--- a/test/prism/snapshots/seattlerb/do_lambda.txt
+++ b/test/prism/snapshots/seattlerb/do_lambda.txt
@@ -14,4 +14,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,3)-(1,4) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/seattlerb/iter_args_1.txt b/test/prism/snapshots/seattlerb/iter_args_1.txt
index 3b0deb9ae6..6432062d82 100644
--- a/test/prism/snapshots/seattlerb/iter_args_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_1.txt
@@ -34,5 +34,6 @@
             │   │   └── closing_loc: (1,8)-(1,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,10)-(1,11) = "}"
+            │   ├── closing_loc: (1,10)-(1,11) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_10_1.txt b/test/prism/snapshots/seattlerb/iter_args_10_1.txt
index 341954af29..b27792c9c5 100644
--- a/test/prism/snapshots/seattlerb/iter_args_10_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_10_1.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,20)-(1,21) = "}"
+            │   ├── closing_loc: (1,20)-(1,21) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_10_2.txt b/test/prism/snapshots/seattlerb/iter_args_10_2.txt
index d2bcc55c71..245233f4fa 100644
--- a/test/prism/snapshots/seattlerb/iter_args_10_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_10_2.txt
@@ -47,5 +47,6 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,24)-(1,25) = "}"
+            │   ├── closing_loc: (1,24)-(1,25) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_11_1.txt b/test/prism/snapshots/seattlerb/iter_args_11_1.txt
index d70ee259f2..571169ee9e 100644
--- a/test/prism/snapshots/seattlerb/iter_args_11_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_11_1.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,21)-(1,22) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,23)-(1,24) = "}"
+            │   ├── closing_loc: (1,23)-(1,24) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_11_2.txt b/test/prism/snapshots/seattlerb/iter_args_11_2.txt
index 553ad42132..2dad442a23 100644
--- a/test/prism/snapshots/seattlerb/iter_args_11_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_11_2.txt
@@ -49,5 +49,6 @@
             │   │   └── closing_loc: (1,25)-(1,26) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,27)-(1,28) = "}"
+            │   ├── closing_loc: (1,27)-(1,28) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_2__19.txt b/test/prism/snapshots/seattlerb/iter_args_2__19.txt
index 967df1ac35..a775d2e425 100644
--- a/test/prism/snapshots/seattlerb/iter_args_2__19.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_2__19.txt
@@ -40,5 +40,6 @@
             │   │   └── closing_loc: (1,11)-(1,12) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,13)-(1,14) = "}"
+            │   ├── closing_loc: (1,13)-(1,14) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_3.txt b/test/prism/snapshots/seattlerb/iter_args_3.txt
index b0570dc8ce..786e0d72fb 100644
--- a/test/prism/snapshots/seattlerb/iter_args_3.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_3.txt
@@ -44,5 +44,6 @@
             │   │   └── closing_loc: (1,17)-(1,18) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,19)-(1,20) = "}"
+            │   ├── closing_loc: (1,19)-(1,20) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_4.txt b/test/prism/snapshots/seattlerb/iter_args_4.txt
index 9e6822aea2..41238bac4f 100644
--- a/test/prism/snapshots/seattlerb/iter_args_4.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_4.txt
@@ -38,5 +38,6 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,15)-(1,16) = "}"
+            │   ├── closing_loc: (1,15)-(1,16) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_5.txt b/test/prism/snapshots/seattlerb/iter_args_5.txt
index 0af5cda322..e0b1400eaf 100644
--- a/test/prism/snapshots/seattlerb/iter_args_5.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_5.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_6.txt b/test/prism/snapshots/seattlerb/iter_args_6.txt
index 34a6a87559..244d99d197 100644
--- a/test/prism/snapshots/seattlerb/iter_args_6.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_6.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_7_1.txt b/test/prism/snapshots/seattlerb/iter_args_7_1.txt
index cb9521efd1..cca154572d 100644
--- a/test/prism/snapshots/seattlerb/iter_args_7_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_7_1.txt
@@ -41,5 +41,6 @@
             │   │   └── closing_loc: (1,15)-(1,16) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,17)-(1,18) = "}"
+            │   ├── closing_loc: (1,17)-(1,18) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_7_2.txt b/test/prism/snapshots/seattlerb/iter_args_7_2.txt
index dcb74967d9..42baefab77 100644
--- a/test/prism/snapshots/seattlerb/iter_args_7_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_7_2.txt
@@ -45,5 +45,6 @@
             │   │   └── closing_loc: (1,19)-(1,20) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,21)-(1,22) = "}"
+            │   ├── closing_loc: (1,21)-(1,22) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_8_1.txt b/test/prism/snapshots/seattlerb/iter_args_8_1.txt
index 7f15b98ea9..fe1d1d0885 100644
--- a/test/prism/snapshots/seattlerb/iter_args_8_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_8_1.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,20)-(1,21) = "}"
+            │   ├── closing_loc: (1,20)-(1,21) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_8_2.txt b/test/prism/snapshots/seattlerb/iter_args_8_2.txt
index 305798bab2..faa9ccd60b 100644
--- a/test/prism/snapshots/seattlerb/iter_args_8_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_8_2.txt
@@ -47,5 +47,6 @@
             │   │   └── closing_loc: (1,22)-(1,23) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,24)-(1,25) = "}"
+            │   ├── closing_loc: (1,24)-(1,25) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_9_1.txt b/test/prism/snapshots/seattlerb/iter_args_9_1.txt
index 0f37861d68..f996e7c796 100644
--- a/test/prism/snapshots/seattlerb/iter_args_9_1.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_9_1.txt
@@ -39,5 +39,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_args_9_2.txt b/test/prism/snapshots/seattlerb/iter_args_9_2.txt
index 3933c7d1da..9832fb912e 100644
--- a/test/prism/snapshots/seattlerb/iter_args_9_2.txt
+++ b/test/prism/snapshots/seattlerb/iter_args_9_2.txt
@@ -43,5 +43,6 @@
             │   │   └── closing_loc: (1,18)-(1,19) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,20)-(1,21) = "}"
+            │   ├── closing_loc: (1,20)-(1,21) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_kwarg.txt b/test/prism/snapshots/seattlerb/iter_kwarg.txt
index 6175f85b7f..dbbc6d6c31 100644
--- a/test/prism/snapshots/seattlerb/iter_kwarg.txt
+++ b/test/prism/snapshots/seattlerb/iter_kwarg.txt
@@ -36,5 +36,6 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,11)-(1,12) = "}"
+            │   ├── closing_loc: (1,11)-(1,12) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt b/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
index 3d197900d1..33a5e25bc1 100644
--- a/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
+++ b/test/prism/snapshots/seattlerb/iter_kwarg_kwsplat.txt
@@ -40,5 +40,6 @@
             │   │   └── closing_loc: (1,14)-(1,15) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,2)-(1,3) = "{"
-            │   └── closing_loc: (1,16)-(1,17) = "}"
+            │   ├── closing_loc: (1,16)-(1,17) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt b/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
index 65048d534d..c951864a8a 100644
--- a/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
+++ b/test/prism/snapshots/seattlerb/lambda_do_vs_brace.txt
@@ -18,7 +18,8 @@
         │   │   │       ├── opening_loc: (1,5)-(1,7) = "do"
         │   │   │       ├── closing_loc: (1,8)-(1,11) = "end"
         │   │   │       ├── parameters: ∅
-        │   │   │       └── body: ∅
+        │   │   │       ├── body: ∅
+        │   │   │       └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -38,7 +39,8 @@
         │   │   │       ├── opening_loc: (3,5)-(3,6) = "{"
         │   │   │       ├── closing_loc: (3,6)-(3,7) = "}"
         │   │   │       ├── parameters: ∅
-        │   │   │       └── body: ∅
+        │   │   │       ├── body: ∅
+        │   │   │       └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -63,7 +65,8 @@
         │   │   │       │   ├── locals: (length: 0)
         │   │   │       │   ├── opening_loc: (5,4)-(5,5) = "("
         │   │   │       │   └── closing_loc: (5,5)-(5,6) = ")"
-        │   │   │       └── body: ∅
+        │   │   │       ├── body: ∅
+        │   │   │       └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -88,7 +91,8 @@
             │   │       │   ├── locals: (length: 0)
             │   │       │   ├── opening_loc: (7,4)-(7,5) = "("
             │   │       │   └── closing_loc: (7,5)-(7,6) = ")"
-            │   │       └── body: ∅
+            │   │       ├── body: ∅
+            │   │       └── numbered_parameters: 0
             │   └── 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 2421482f67..79fe45763e 100644
--- a/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt
+++ b/test/prism/snapshots/seattlerb/parse_line_call_no_args.txt
@@ -55,5 +55,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,2)-(1,4) = "do"
-            │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   ├── closing_loc: (3,0)-(3,3) = "end"
+            │   └── numbered_parameters: 0
             └── 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 e582bc2b5f..68611308c6 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,5 +68,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   ├── closing_loc: (3,0)-(3,3) = "end"
+            │   └── numbered_parameters: 0
             └── 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 ca8f6fd729..517701bace 100644
--- a/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
+++ b/test/prism/snapshots/seattlerb/parse_line_iter_call_parens.txt
@@ -68,5 +68,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   ├── closing_loc: (3,0)-(3,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/pipe_semicolon.txt b/test/prism/snapshots/seattlerb/pipe_semicolon.txt
index 1201e87a66..a788b92ab8 100644
--- a/test/prism/snapshots/seattlerb/pipe_semicolon.txt
+++ b/test/prism/snapshots/seattlerb/pipe_semicolon.txt
@@ -34,5 +34,6 @@
             │   │   └── closing_loc: (1,13)-(1,14) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   └── closing_loc: (1,15)-(1,18) = "end"
+            │   ├── closing_loc: (1,15)-(1,18) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/pipe_space.txt b/test/prism/snapshots/seattlerb/pipe_space.txt
index 9ecf022775..663377bdce 100644
--- a/test/prism/snapshots/seattlerb/pipe_space.txt
+++ b/test/prism/snapshots/seattlerb/pipe_space.txt
@@ -32,5 +32,6 @@
             │   │   └── closing_loc: (1,9)-(1,10) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,4)-(1,6) = "do"
-            │   └── closing_loc: (1,11)-(1,14) = "end"
+            │   ├── closing_loc: (1,11)-(1,14) = "end"
+            │   └── numbered_parameters: 0
             └── 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 bdd92a5482..5264eee74b 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_ensure_result.txt
@@ -44,7 +44,8 @@
             │   │   │   │   └── 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"
+            │   │   ├── closing_loc: (5,0)-(5,3) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 a137470b71..be1a23f12b 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_no_raise.txt
@@ -67,5 +67,6 @@
             │   │   │   └── 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"
+            │   ├── closing_loc: (9,0)-(9,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt b/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
index a7300bda96..c62a25c804 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_raised.txt
@@ -47,5 +47,6 @@
             │   │   │   └── 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"
+            │   ├── closing_loc: (5,0)-(5,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt b/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
index 1d192161d7..2614d426dc 100644
--- a/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
+++ b/test/prism/snapshots/seattlerb/rescue_do_end_rescued.txt
@@ -72,5 +72,6 @@
             │   │   │   └── 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"
+            │   ├── closing_loc: (9,0)-(9,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/rescue_in_block.txt b/test/prism/snapshots/seattlerb/rescue_in_block.txt
index 8864c835b1..83bf2a7c5d 100644
--- a/test/prism/snapshots/seattlerb/rescue_in_block.txt
+++ b/test/prism/snapshots/seattlerb/rescue_in_block.txt
@@ -43,5 +43,6 @@
             │   │   ├── ensure_clause: ∅
             │   │   └── end_keyword_loc: (4,0)-(4,3) = "end"
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   └── closing_loc: (4,0)-(4,3) = "end"
+            │   ├── closing_loc: (4,0)-(4,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt b/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
index 7392e71525..fcfd205f7c 100644
--- a/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
+++ b/test/prism/snapshots/seattlerb/stabby_arg_no_paren.txt
@@ -24,4 +24,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
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 0661b2a2aa..64ee528f2c 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,4 +41,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,20)-(1,21) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt b/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
index 19ea912814..d3ab185420 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_iter_call.txt
@@ -23,35 +23,37 @@
             │   │       │   ├── 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"
-            │   │                   └── flags: ∅
+            │   │       ├── 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
             │   └── 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 84f7aaebf9..976f129fcb 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,30 +23,32 @@
             │   │       │   ├── 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"
-            │   │                   └── flags: ∅
+            │   │       ├── 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
             │   └── 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 fe95390a27..beed3b76f5 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_kw.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_kw.txt
@@ -28,4 +28,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,8)-(1,9) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt b/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
index 99a2e70586..77ce9defa3 100644
--- a/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
+++ b/test/prism/snapshots/seattlerb/stabby_block_kw__required.txt
@@ -25,4 +25,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,6)-(1,7) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/seattlerb/stabby_proc_scope.txt b/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
index 059192d67f..e11a9419fb 100644
--- a/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
+++ b/test/prism/snapshots/seattlerb/stabby_proc_scope.txt
@@ -26,4 +26,5 @@
             │   │       └── name: :b
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,7)-(1,8) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/super.txt b/test/prism/snapshots/super.txt
index 55d7526b37..72ed5d8877 100644
--- a/test/prism/snapshots/super.txt
+++ b/test/prism/snapshots/super.txt
@@ -72,7 +72,8 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (13,6)-(13,7) = "{"
-        │       └── closing_loc: (13,7)-(13,8) = "}"
+        │       ├── closing_loc: (13,7)-(13,8) = "}"
+        │       └── numbered_parameters: 0
         ├── @ SuperNode (location: (15,0)-(15,17))
         │   ├── keyword_loc: (15,0)-(15,5) = "super"
         │   ├── lparen_loc: (15,5)-(15,6) = "("
@@ -93,7 +94,8 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (15,15)-(15,16) = "{"
-        │       └── closing_loc: (15,16)-(15,17) = "}"
+        │       ├── closing_loc: (15,16)-(15,17) = "}"
+        │       └── numbered_parameters: 0
         └── @ 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 b88e5f23a1..76d51d709e 100644
--- a/test/prism/snapshots/unparser/corpus/literal/block.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/block.txt
@@ -17,7 +17,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,5) = "{"
-        │   │   └── closing_loc: (2,0)-(2,1) = "}"
+        │   │   ├── closing_loc: (2,0)-(2,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(4,1))
         │   ├── receiver: ∅
@@ -48,7 +49,8 @@
         │   │   │   └── closing_loc: (3,8)-(3,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,4)-(3,5) = "{"
-        │   │   └── closing_loc: (4,0)-(4,1) = "}"
+        │   │   ├── closing_loc: (4,0)-(4,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(6,1))
         │   ├── receiver: ∅
@@ -83,7 +85,8 @@
         │   │   │   └── closing_loc: (5,9)-(5,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,4)-(5,5) = "{"
-        │   │   └── closing_loc: (6,0)-(6,1) = "}"
+        │   │   ├── closing_loc: (6,0)-(6,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(8,1))
         │   ├── receiver: ∅
@@ -120,7 +123,8 @@
         │   │   │   └── closing_loc: (7,12)-(7,13) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,4)-(7,5) = "{"
-        │   │   └── closing_loc: (8,0)-(8,1) = "}"
+        │   │   ├── closing_loc: (8,0)-(8,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(10,1))
         │   ├── receiver: ∅
@@ -153,7 +157,8 @@
         │   │   │   └── closing_loc: (9,11)-(9,12) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,4)-(9,5) = "{"
-        │   │   └── closing_loc: (10,0)-(10,1) = "}"
+        │   │   ├── closing_loc: (10,0)-(10,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(13,1))
         │   ├── receiver: ∅
@@ -177,7 +182,8 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (12,2)-(12,5))
         │   │   ├── opening_loc: (11,7)-(11,8) = "{"
-        │   │   └── closing_loc: (13,0)-(13,1) = "}"
+        │   │   ├── closing_loc: (13,0)-(13,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (14,0)-(16,1))
         │   ├── receiver: ∅
@@ -215,7 +221,8 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (15,2)-(15,5))
         │   │   ├── opening_loc: (14,4)-(14,5) = "{"
-        │   │   └── closing_loc: (16,0)-(16,1) = "}"
+        │   │   ├── closing_loc: (16,0)-(16,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(19,1))
         │   ├── receiver: ∅
@@ -253,7 +260,8 @@
         │   │   │   └── body: (length: 1)
         │   │   │       └── @ NilNode (location: (18,2)-(18,5))
         │   │   ├── opening_loc: (17,4)-(17,5) = "{"
-        │   │   └── closing_loc: (19,0)-(19,1) = "}"
+        │   │   ├── closing_loc: (19,0)-(19,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (20,0)-(22,1))
         │   ├── receiver: ∅
@@ -281,7 +289,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (20,4)-(20,5) = "{"
-        │   │   └── closing_loc: (22,0)-(22,1) = "}"
+        │   │   ├── closing_loc: (22,0)-(22,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(25,1))
         │   ├── receiver:
@@ -344,7 +353,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (23,8)-(23,9) = "{"
-        │   │   └── closing_loc: (25,0)-(25,1) = "}"
+        │   │   ├── closing_loc: (25,0)-(25,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (26,0)-(27,1))
         │   ├── receiver:
@@ -389,7 +399,8 @@
         │   │   │   └── closing_loc: (26,16)-(26,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (26,8)-(26,9) = "{"
-        │   │   └── closing_loc: (27,0)-(27,1) = "}"
+        │   │   ├── closing_loc: (27,0)-(27,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (28,0)-(29,1))
         │   ├── receiver:
@@ -432,7 +443,8 @@
         │   │   │   └── closing_loc: (28,15)-(28,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (28,8)-(28,9) = "{"
-        │   │   └── closing_loc: (29,0)-(29,1) = "}"
+        │   │   ├── closing_loc: (29,0)-(29,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (30,0)-(31,1))
         │   ├── receiver:
@@ -467,7 +479,8 @@
         │   │   │   └── closing_loc: (30,17)-(30,18) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (30,8)-(30,9) = "{"
-        │   │   └── closing_loc: (31,0)-(31,1) = "}"
+        │   │   ├── closing_loc: (31,0)-(31,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (32,0)-(34,1))
         │   ├── receiver:
@@ -522,7 +535,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (32,8)-(32,9) = "{"
-        │   │   └── closing_loc: (34,0)-(34,1) = "}"
+        │   │   ├── closing_loc: (34,0)-(34,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(37,1))
         │   ├── receiver:
@@ -582,7 +596,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (35,8)-(35,9) = "{"
-        │   │   └── closing_loc: (37,0)-(37,1) = "}"
+        │   │   ├── closing_loc: (37,0)-(37,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (38,0)-(40,1))
         │   ├── receiver:
@@ -648,7 +663,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (38,8)-(38,9) = "{"
-        │   │   └── closing_loc: (40,0)-(40,1) = "}"
+        │   │   ├── closing_loc: (40,0)-(40,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(43,1))
         │   ├── receiver:
@@ -716,7 +732,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (41,8)-(41,9) = "{"
-        │   │   └── closing_loc: (43,0)-(43,1) = "}"
+        │   │   ├── closing_loc: (43,0)-(43,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (44,0)-(46,1))
         │   ├── receiver:
@@ -777,7 +794,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: variable_call
         │   │   ├── opening_loc: (44,8)-(44,9) = "{"
-        │   │   └── closing_loc: (46,0)-(46,1) = "}"
+        │   │   ├── closing_loc: (46,0)-(46,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (47,0)-(48,5))
         │   ├── receiver:
@@ -805,7 +823,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (47,8)-(47,9) = "{"
-        │   │   │   └── closing_loc: (48,0)-(48,1) = "}"
+        │   │   │   ├── closing_loc: (48,0)-(48,1) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (48,1)-(48,2) = "."
         │   ├── name: :baz
@@ -848,7 +867,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (51,0)-(51,3) = "end"
         │   │   ├── opening_loc: (49,2)-(49,4) = "do"
-        │   │   └── closing_loc: (51,0)-(51,3) = "end"
+        │   │   ├── closing_loc: (51,0)-(51,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (52,0)-(56,3))
         │   ├── receiver: ∅
@@ -900,7 +920,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (56,0)-(56,3) = "end"
         │   │   ├── opening_loc: (52,2)-(52,4) = "do"
-        │   │   └── closing_loc: (56,0)-(56,3) = "end"
+        │   │   ├── closing_loc: (56,0)-(56,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (57,0)-(61,3))
         │   ├── receiver: ∅
@@ -969,7 +990,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (61,0)-(61,3) = "end"
         │   │   ├── opening_loc: (57,2)-(57,4) = "do"
-        │   │   └── closing_loc: (61,0)-(61,3) = "end"
+        │   │   ├── closing_loc: (61,0)-(61,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (62,0)-(66,3))
         │   ├── receiver: ∅
@@ -1041,7 +1063,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (66,0)-(66,3) = "end"
         │   │   ├── opening_loc: (62,2)-(62,4) = "do"
-        │   │   └── closing_loc: (66,0)-(66,3) = "end"
+        │   │   ├── closing_loc: (66,0)-(66,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (67,0)-(71,3))
         │   ├── receiver: ∅
@@ -1108,7 +1131,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (71,0)-(71,3) = "end"
         │   │   ├── opening_loc: (67,2)-(67,4) = "do"
-        │   │   └── closing_loc: (71,0)-(71,3) = "end"
+        │   │   ├── closing_loc: (71,0)-(71,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (72,0)-(75,3))
         │   ├── receiver: ∅
@@ -1152,7 +1176,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (75,0)-(75,3) = "end"
         │   │   ├── opening_loc: (72,2)-(72,4) = "do"
-        │   │   └── closing_loc: (75,0)-(75,3) = "end"
+        │   │   ├── closing_loc: (75,0)-(75,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (76,0)-(81,3))
         │   ├── receiver: ∅
@@ -1210,7 +1235,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (81,0)-(81,3) = "end"
         │   │   ├── opening_loc: (76,2)-(76,4) = "do"
-        │   │   └── closing_loc: (81,0)-(81,3) = "end"
+        │   │   ├── closing_loc: (81,0)-(81,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (82,0)-(86,3))
         │   ├── receiver: ∅
@@ -1280,7 +1306,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (86,0)-(86,3) = "end"
         │   │   ├── opening_loc: (82,2)-(82,4) = "do"
-        │   │   └── closing_loc: (86,0)-(86,3) = "end"
+        │   │   ├── closing_loc: (86,0)-(86,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (87,0)-(89,3))
         │   ├── receiver: ∅
@@ -1307,7 +1334,8 @@
         │   │   │   │   └── 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"
+        │   │   ├── closing_loc: (89,0)-(89,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (90,0)-(93,3))
         │   ├── receiver: ∅
@@ -1341,7 +1369,8 @@
         │   │   │   │   └── 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"
+        │   │   ├── closing_loc: (93,0)-(93,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (94,0)-(96,1))
             ├── receiver: ∅
@@ -1378,5 +1407,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (94,4)-(94,5) = "{"
-            │   └── closing_loc: (96,0)-(96,1) = "}"
+            │   ├── closing_loc: (96,0)-(96,1) = "}"
+            │   └── numbered_parameters: 2
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/defs.txt b/test/prism/snapshots/unparser/corpus/literal/defs.txt
index 52cd344710..0f6a2de064 100644
--- a/test/prism/snapshots/unparser/corpus/literal/defs.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/defs.txt
@@ -141,7 +141,8 @@
         │   │   │   │   │   └── closing_loc: (17,15)-(17,16) = "|"
         │   │   │   │   ├── body: ∅
         │   │   │   │   ├── opening_loc: (17,9)-(17,10) = "{"
-        │   │   │   │   └── closing_loc: (18,0)-(18,1) = "}"
+        │   │   │   │   ├── closing_loc: (18,0)-(18,1) = "}"
+        │   │   │   │   └── numbered_parameters: 0
         │   │   │   └── 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 33391fe56e..13c3a74486 100644
--- a/test/prism/snapshots/unparser/corpus/literal/dstr.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/dstr.txt
@@ -335,5 +335,6 @@
             │   │   └── closing_loc: (34,20)-(34,21) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (34,16)-(34,17) = "{"
-            │   └── closing_loc: (37,0)-(37,1) = "}"
+            │   ├── closing_loc: (37,0)-(37,1) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/literal/if.txt b/test/prism/snapshots/unparser/corpus/literal/if.txt
index 4cd56d5a6b..97fa18b9d9 100644
--- a/test/prism/snapshots/unparser/corpus/literal/if.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/if.txt
@@ -254,7 +254,8 @@
             │   │   │           ├── name: :pair
             │   │   │           └── depth: 0
             │   │   ├── opening_loc: (31,7)-(31,8) = "{"
-            │   │   └── closing_loc: (33,0)-(33,1) = "}"
+            │   │   ├── closing_loc: (33,0)-(33,1) = "}"
+            │   │   └── numbered_parameters: 0
             │   └── 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 a8fb22d80f..130623ef10 100644
--- a/test/prism/snapshots/unparser/corpus/literal/lambda.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/lambda.txt
@@ -17,7 +17,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,7)-(1,8) = "{"
-        │   │   └── closing_loc: (2,0)-(2,1) = "}"
+        │   │   ├── closing_loc: (2,0)-(2,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(5,1))
         │   ├── receiver: ∅
@@ -55,7 +56,8 @@
         │   │   │           ├── name: :a
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (3,7)-(3,8) = "{"
-        │   │   └── closing_loc: (5,0)-(5,1) = "}"
+        │   │   ├── closing_loc: (5,0)-(5,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ LambdaNode (location: (6,0)-(7,1))
         │   ├── locals: []
@@ -68,7 +70,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (6,2)-(6,3) = "("
         │   │   └── closing_loc: (6,3)-(6,4) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (8,0)-(9,1))
         │   ├── locals: [:a]
         │   ├── operator_loc: (8,0)-(8,2) = "->"
@@ -90,7 +93,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (8,2)-(8,3) = "("
         │   │   └── closing_loc: (8,4)-(8,5) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ LambdaNode (location: (10,0)-(11,1))
         │   ├── locals: [:a, :b]
         │   ├── operator_loc: (10,0)-(10,2) = "->"
@@ -114,7 +118,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (10,2)-(10,3) = "("
         │   │   └── closing_loc: (10,7)-(10,8) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ LambdaNode (location: (12,0)-(13,1))
             ├── locals: [:a, :b, :c]
             ├── operator_loc: (12,0)-(12,2) = "->"
@@ -140,4 +145,5 @@
             │   │       └── name: :c
             │   ├── opening_loc: (12,2)-(12,3) = "("
             │   └── closing_loc: (12,10)-(12,11) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/unparser/corpus/literal/literal.txt b/test/prism/snapshots/unparser/corpus/literal/literal.txt
index aa36dd7e35..b407f23d56 100644
--- a/test/prism/snapshots/unparser/corpus/literal/literal.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/literal.txt
@@ -1081,7 +1081,8 @@
         │   │   │           │       └── unescaped: "\na"
         │   │   │           └── closing_loc: (85,6)-(85,7) = "\""
         │   │   ├── opening_loc: (83,4)-(83,5) = "{"
-        │   │   └── closing_loc: (86,0)-(86,1) = "}"
+        │   │   ├── closing_loc: (86,0)-(86,1) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── 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 469b3dae4b..bdeacaceea 100644
--- a/test/prism/snapshots/unparser/corpus/literal/send.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/send.txt
@@ -373,7 +373,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (33,5)-(33,6) = "{"
-        │   │   │   └── closing_loc: (34,0)-(34,1) = "}"
+        │   │   │   ├── closing_loc: (34,0)-(34,1) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── 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 8e79acb870..8618dc6e6d 100644
--- a/test/prism/snapshots/unparser/corpus/literal/since/27.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/since/27.txt
@@ -9,28 +9,29 @@
         │   ├── 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: ∅
+        │   ├── 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
         └── @ 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 8175d3504a..daef89f848 100644
--- a/test/prism/snapshots/unparser/corpus/literal/super.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/super.txt
@@ -142,7 +142,8 @@
         │   │   │       │   │           ├── block: ∅
         │   │   │       │   │           └── flags: variable_call
         │   │   │       │   ├── opening_loc: (7,8)-(7,9) = "{"
-        │   │   │       │   └── closing_loc: (9,0)-(9,1) = "}"
+        │   │   │       │   ├── closing_loc: (9,0)-(9,1) = "}"
+        │   │   │       │   └── numbered_parameters: 0
         │   │   │       └── flags: ∅
         │   │   └── flags: ∅
         │   ├── rparen_loc: (9,1)-(9,2) = ")"
@@ -166,7 +167,8 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (10,6)-(10,7) = "{"
-        │       └── closing_loc: (12,0)-(12,1) = "}"
+        │       ├── closing_loc: (12,0)-(12,1) = "}"
+        │       └── numbered_parameters: 0
         ├── @ SuperNode (location: (13,0)-(15,1))
         │   ├── keyword_loc: (13,0)-(13,5) = "super"
         │   ├── lparen_loc: (13,5)-(13,6) = "("
@@ -203,7 +205,8 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (13,9)-(13,10) = "{"
-        │       └── closing_loc: (15,0)-(15,1) = "}"
+        │       ├── closing_loc: (15,0)-(15,1) = "}"
+        │       └── numbered_parameters: 0
         ├── @ SuperNode (location: (16,0)-(18,1))
         │   ├── keyword_loc: (16,0)-(16,5) = "super"
         │   ├── lparen_loc: (16,5)-(16,6) = "("
@@ -227,7 +230,8 @@
         │       │           ├── block: ∅
         │       │           └── flags: variable_call
         │       ├── opening_loc: (16,8)-(16,9) = "{"
-        │       └── closing_loc: (18,0)-(18,1) = "}"
+        │       ├── closing_loc: (18,0)-(18,1) = "}"
+        │       └── numbered_parameters: 0
         └── @ SuperNode (location: (19,0)-(21,1))
             ├── keyword_loc: (19,0)-(19,5) = "super"
             ├── lparen_loc: (19,5)-(19,6) = "("
@@ -274,4 +278,5 @@
                 │           ├── block: ∅
                 │           └── flags: variable_call
                 ├── opening_loc: (19,12)-(19,13) = "{"
-                └── closing_loc: (21,0)-(21,1) = "}"
+                ├── closing_loc: (21,0)-(21,1) = "}"
+                └── numbered_parameters: 0
diff --git a/test/prism/snapshots/unparser/corpus/literal/while.txt b/test/prism/snapshots/unparser/corpus/literal/while.txt
index 7bcf111cef..5771e5da39 100644
--- a/test/prism/snapshots/unparser/corpus/literal/while.txt
+++ b/test/prism/snapshots/unparser/corpus/literal/while.txt
@@ -70,7 +70,8 @@
         │   │           │   │           │           └── operator_loc: (4,10)-(4,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (2,6)-(2,7) = "{"
-        │   │           │   └── closing_loc: (6,2)-(6,3) = "}"
+        │   │           │   ├── closing_loc: (6,2)-(6,3) = "}"
+        │   │           │   └── numbered_parameters: 0
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (7,0)-(7,3) = "end"
         │   └── name: :A
@@ -334,7 +335,8 @@
         │   │           │   │           │           └── operator_loc: (30,10)-(30,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (28,7)-(28,8) = "{"
-        │   │           │   └── closing_loc: (32,2)-(32,3) = "}"
+        │   │           │   ├── closing_loc: (32,2)-(32,3) = "}"
+        │   │           │   └── numbered_parameters: 0
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (33,0)-(33,3) = "end"
         │   └── name: :A
@@ -405,7 +407,8 @@
         │   │           │   │           │           └── operator_loc: (38,10)-(38,11) = "="
         │   │           │   │           └── flags: ∅
         │   │           │   ├── opening_loc: (36,7)-(36,8) = "{"
-        │   │           │   └── closing_loc: (40,2)-(40,3) = "}"
+        │   │           │   ├── closing_loc: (40,2)-(40,3) = "}"
+        │   │           │   └── numbered_parameters: 0
         │   │           └── flags: ∅
         │   ├── end_keyword_loc: (41,0)-(41,3) = "end"
         │   └── name: :A
@@ -629,7 +632,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (61,11)-(61,12) = "{"
-        │   │   │           │   └── closing_loc: (62,0)-(62,1) = "}"
+        │   │   │           │   ├── closing_loc: (62,0)-(62,1) = "}"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (61,6)-(61,7) = "("
         │   │   └── closing_loc: (62,1)-(62,2) = ")"
@@ -682,7 +686,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (70,11)-(70,12) = "{"
-            │   │           │   └── closing_loc: (71,0)-(71,1) = "}"
+            │   │           │   ├── closing_loc: (71,0)-(71,1) = "}"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── 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 f3d5440a59..c3ac1f85c6 100644
--- a/test/prism/snapshots/unparser/corpus/semantic/block.txt
+++ b/test/prism/snapshots/unparser/corpus/semantic/block.txt
@@ -17,7 +17,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,6) = "do"
-        │   │   └── closing_loc: (2,0)-(2,3) = "end"
+        │   │   ├── closing_loc: (2,0)-(2,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (4,0)-(6,3))
         │   ├── receiver: ∅
@@ -47,7 +48,8 @@
         │   │   │   ├── ensure_clause: ∅
         │   │   │   └── end_keyword_loc: (6,0)-(6,3) = "end"
         │   │   ├── opening_loc: (4,4)-(4,6) = "do"
-        │   │   └── closing_loc: (6,0)-(6,3) = "end"
+        │   │   ├── closing_loc: (6,0)-(6,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (8,0)-(11,3))
         │   ├── receiver: ∅
@@ -72,7 +74,8 @@
         │   │   │       │       @ 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"
+        │   │   ├── closing_loc: (11,0)-(11,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(14,3))
         │   ├── receiver: ∅
@@ -103,7 +106,8 @@
         │   │   │   └── closing_loc: (13,9)-(13,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,4)-(13,6) = "do"
-        │   │   └── closing_loc: (14,0)-(14,3) = "end"
+        │   │   ├── closing_loc: (14,0)-(14,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (16,0)-(20,3))
         │   ├── receiver: ∅
@@ -148,7 +152,8 @@
         │   │   │           ├── name: :a
         │   │   │           └── depth: 0
         │   │   ├── opening_loc: (16,12)-(16,14) = "do"
-        │   │   └── closing_loc: (20,0)-(20,3) = "end"
+        │   │   ├── closing_loc: (20,0)-(20,3) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (22,0)-(26,3))
             ├── receiver: ∅
@@ -185,5 +190,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: variable_call
             │   ├── opening_loc: (22,12)-(22,14) = "do"
-            │   └── closing_loc: (26,0)-(26,3) = "end"
+            │   ├── closing_loc: (26,0)-(26,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/unparser/corpus/semantic/while.txt b/test/prism/snapshots/unparser/corpus/semantic/while.txt
index 6339a0208a..6d79ccfeda 100644
--- a/test/prism/snapshots/unparser/corpus/semantic/while.txt
+++ b/test/prism/snapshots/unparser/corpus/semantic/while.txt
@@ -21,7 +21,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (1,11)-(1,12) = "{"
-        │   │   │   └── closing_loc: (1,12)-(1,13) = "}"
+        │   │   │   ├── closing_loc: (1,12)-(1,13) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (1,0)-(1,1))
@@ -55,7 +56,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (3,9)-(3,10) = "{"
-        │   │   │   └── closing_loc: (3,10)-(3,11) = "}"
+        │   │   │   ├── closing_loc: (3,10)-(3,11) = "}"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (4,2)-(4,3))
@@ -129,7 +131,8 @@
         │   │   │   │   ├── parameters: ∅
         │   │   │   │   ├── body: ∅
         │   │   │   │   ├── opening_loc: (9,15)-(9,16) = "{"
-        │   │   │   │   └── closing_loc: (9,17)-(9,18) = "}"
+        │   │   │   │   ├── closing_loc: (9,17)-(9,18) = "}"
+        │   │   │   │   └── numbered_parameters: 0
         │   │   │   └── flags: ∅
         │   │   └── operator_loc: (9,10)-(9,12) = "&&"
         │   ├── statements:
@@ -212,7 +215,8 @@
         │   │   │   │           ├── block: ∅
         │   │   │   │           └── flags: variable_call
         │   │   │   ├── opening_loc: (15,18)-(15,20) = "do"
-        │   │   │   └── closing_loc: (18,0)-(18,3) = "end"
+        │   │   │   ├── closing_loc: (18,0)-(18,3) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── statements:
         │   │   @ StatementsNode (location: (15,0)-(15,1))
diff --git a/test/prism/snapshots/while.txt b/test/prism/snapshots/while.txt
index 3d74f777b6..8b547fee88 100644
--- a/test/prism/snapshots/while.txt
+++ b/test/prism/snapshots/while.txt
@@ -134,7 +134,8 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (13,27)-(13,29) = "do"
-        │   │   │   │           │   └── closing_loc: (13,30)-(13,33) = "end"
+        │   │   │   │           │   ├── closing_loc: (13,30)-(13,33) = "end"
+        │   │   │   │           │   └── numbered_parameters: 0
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -190,7 +191,8 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (15,24)-(15,26) = "do"
-        │   │   │           │   │   └── closing_loc: (15,27)-(15,30) = "end"
+        │   │   │           │   │   ├── closing_loc: (15,27)-(15,30) = "end"
+        │   │   │           │   │   └── numbered_parameters: 0
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (15,18)-(15,19) = "="
         │   │   ├── end_keyword_loc: (15,32)-(15,35) = "end"
@@ -229,7 +231,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (17,25)-(17,27) = "do"
-        │   │   │           │   └── closing_loc: (17,28)-(17,31) = "end"
+        │   │   │           │   ├── closing_loc: (17,28)-(17,31) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: (17,33)-(17,36) = "end"
         │   ├── statements:
@@ -271,7 +274,8 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (19,29)-(19,31) = "do"
-        │   │   │           │   │   └── closing_loc: (19,32)-(19,35) = "end"
+        │   │   │           │   │   ├── closing_loc: (19,32)-(19,35) = "end"
+        │   │   │           │   │   └── numbered_parameters: 0
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (19,23)-(19,24) = "="
         │   │   └── end_keyword_loc: (19,37)-(19,40) = "end"
@@ -308,7 +312,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (21,20)-(21,22) = "do"
-        │   │   │           │   └── closing_loc: (21,23)-(21,26) = "end"
+        │   │   │           │   ├── closing_loc: (21,23)-(21,26) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── 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 1f04f6d5f1..62125b7f2d 100644
--- a/test/prism/snapshots/whitequark/arg_label.txt
+++ b/test/prism/snapshots/whitequark/arg_label.txt
@@ -108,5 +108,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (6,2)-(6,3) = "{"
-            │   └── closing_loc: (6,11)-(6,12) = "}"
+            │   ├── closing_loc: (6,11)-(6,12) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/arg_scope.txt b/test/prism/snapshots/whitequark/arg_scope.txt
index cb08a16a4c..9aba1c6de1 100644
--- a/test/prism/snapshots/whitequark/arg_scope.txt
+++ b/test/prism/snapshots/whitequark/arg_scope.txt
@@ -29,5 +29,6 @@
             │   │           ├── name: :a
             │   │           └── depth: 0
             │   ├── opening_loc: (1,6)-(1,7) = "{"
-            │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/begin_cmdarg.txt b/test/prism/snapshots/whitequark/begin_cmdarg.txt
index 696be9e2f8..cf7d41b085 100644
--- a/test/prism/snapshots/whitequark/begin_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/begin_cmdarg.txt
@@ -37,7 +37,8 @@
             │   │       │           │   │       └── @ IntegerNode (location: (1,19)-(1,20))
             │   │       │           │   │           └── flags: decimal
             │   │       │           │   ├── opening_loc: (1,16)-(1,18) = "do"
-            │   │       │           │   └── closing_loc: (1,21)-(1,24) = "end"
+            │   │       │           │   ├── closing_loc: (1,21)-(1,24) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── flags: ∅
             │   │       ├── rescue_clause: ∅
             │   │       ├── else_clause: ∅
diff --git a/test/prism/snapshots/whitequark/blockargs.txt b/test/prism/snapshots/whitequark/blockargs.txt
index ad2210cb6e..150d02bf7a 100644
--- a/test/prism/snapshots/whitequark/blockargs.txt
+++ b/test/prism/snapshots/whitequark/blockargs.txt
@@ -17,7 +17,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,1)-(1,2) = "{"
-        │   │   └── closing_loc: (1,4)-(1,5) = "}"
+        │   │   ├── closing_loc: (1,4)-(1,5) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,8))
         │   ├── receiver: ∅
@@ -38,7 +39,8 @@
         │   │   │   └── closing_loc: (3,5)-(3,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,1)-(3,2) = "{"
-        │   │   └── closing_loc: (3,7)-(3,8) = "}"
+        │   │   ├── closing_loc: (3,7)-(3,8) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,9))
         │   ├── receiver: ∅
@@ -71,7 +73,8 @@
         │   │   │   └── closing_loc: (5,6)-(5,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,1)-(5,2) = "{"
-        │   │   └── closing_loc: (5,8)-(5,9) = "}"
+        │   │   ├── closing_loc: (5,8)-(5,9) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,16))
         │   ├── receiver: ∅
@@ -108,7 +111,8 @@
         │   │   │   └── closing_loc: (7,13)-(7,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,1)-(7,2) = "{"
-        │   │   └── closing_loc: (7,15)-(7,16) = "}"
+        │   │   ├── closing_loc: (7,15)-(7,16) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,12))
         │   ├── receiver: ∅
@@ -145,7 +149,8 @@
         │   │   │   └── closing_loc: (9,9)-(9,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,1)-(9,2) = "{"
-        │   │   └── closing_loc: (9,11)-(9,12) = "}"
+        │   │   ├── closing_loc: (9,11)-(9,12) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,16))
         │   ├── receiver: ∅
@@ -184,7 +189,8 @@
         │   │   │   └── closing_loc: (11,13)-(11,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,1)-(11,2) = "{"
-        │   │   └── closing_loc: (11,15)-(11,16) = "}"
+        │   │   ├── closing_loc: (11,15)-(11,16) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,13))
         │   ├── receiver: ∅
@@ -221,7 +227,8 @@
         │   │   │   └── closing_loc: (13,10)-(13,11) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,1)-(13,2) = "{"
-        │   │   └── closing_loc: (13,12)-(13,13) = "}"
+        │   │   ├── closing_loc: (13,12)-(13,13) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,9))
         │   ├── receiver: ∅
@@ -254,7 +261,8 @@
         │   │   │   └── closing_loc: (15,6)-(15,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,1)-(15,2) = "{"
-        │   │   └── closing_loc: (15,8)-(15,9) = "}"
+        │   │   ├── closing_loc: (15,8)-(15,9) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,8))
         │   ├── receiver: ∅
@@ -287,7 +295,8 @@
         │   │   │   └── closing_loc: (17,5)-(17,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,1)-(17,2) = "{"
-        │   │   └── closing_loc: (17,7)-(17,8) = "}"
+        │   │   ├── closing_loc: (17,7)-(17,8) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(21,3))
         │   ├── receiver: ∅
@@ -310,7 +319,8 @@
         │   │   │   └── closing_loc: (21,0)-(21,1) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,1)-(19,2) = "{"
-        │   │   └── closing_loc: (21,2)-(21,3) = "}"
+        │   │   ├── closing_loc: (21,2)-(21,3) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(23,9))
         │   ├── receiver: ∅
@@ -333,7 +343,8 @@
         │   │   │   └── closing_loc: (23,6)-(23,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (23,1)-(23,2) = "{"
-        │   │   └── closing_loc: (23,8)-(23,9) = "}"
+        │   │   ├── closing_loc: (23,8)-(23,9) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (25,0)-(25,12))
         │   ├── receiver: ∅
@@ -368,7 +379,8 @@
         │   │   │   └── closing_loc: (25,9)-(25,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (25,1)-(25,2) = "{"
-        │   │   └── closing_loc: (25,11)-(25,12) = "}"
+        │   │   ├── closing_loc: (25,11)-(25,12) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (27,0)-(27,15))
         │   ├── receiver: ∅
@@ -407,7 +419,8 @@
         │   │   │   └── closing_loc: (27,12)-(27,13) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (27,1)-(27,2) = "{"
-        │   │   └── closing_loc: (27,14)-(27,15) = "}"
+        │   │   ├── closing_loc: (27,14)-(27,15) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (29,0)-(29,19))
         │   ├── receiver: ∅
@@ -448,7 +461,8 @@
         │   │   │   └── closing_loc: (29,16)-(29,17) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (29,1)-(29,2) = "{"
-        │   │   └── closing_loc: (29,18)-(29,19) = "}"
+        │   │   ├── closing_loc: (29,18)-(29,19) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,16))
         │   ├── receiver: ∅
@@ -487,7 +501,8 @@
         │   │   │   └── closing_loc: (31,13)-(31,14) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (31,1)-(31,2) = "{"
-        │   │   └── closing_loc: (31,15)-(31,16) = "}"
+        │   │   ├── closing_loc: (31,15)-(31,16) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,12))
         │   ├── receiver: ∅
@@ -522,7 +537,8 @@
         │   │   │   └── closing_loc: (33,9)-(33,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (33,1)-(33,2) = "{"
-        │   │   └── closing_loc: (33,11)-(33,12) = "}"
+        │   │   ├── closing_loc: (33,11)-(33,12) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,11))
         │   ├── receiver: ∅
@@ -557,7 +573,8 @@
         │   │   │   └── closing_loc: (35,8)-(35,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,1)-(35,2) = "{"
-        │   │   └── closing_loc: (35,10)-(35,11) = "}"
+        │   │   ├── closing_loc: (35,10)-(35,11) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (37,0)-(37,12))
         │   ├── receiver: ∅
@@ -594,7 +611,8 @@
         │   │   │   └── closing_loc: (37,9)-(37,10) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (37,1)-(37,2) = "{"
-        │   │   └── closing_loc: (37,11)-(37,12) = "}"
+        │   │   ├── closing_loc: (37,11)-(37,12) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (39,0)-(39,11))
         │   ├── receiver: ∅
@@ -627,7 +645,8 @@
         │   │   │   └── closing_loc: (39,8)-(39,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (39,1)-(39,2) = "{"
-        │   │   └── closing_loc: (39,10)-(39,11) = "}"
+        │   │   ├── closing_loc: (39,10)-(39,11) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (41,0)-(41,17))
         │   ├── receiver: ∅
@@ -669,7 +688,8 @@
         │   │   │   └── closing_loc: (41,14)-(41,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (41,1)-(41,2) = "{"
-        │   │   └── closing_loc: (41,16)-(41,17) = "}"
+        │   │   ├── closing_loc: (41,16)-(41,17) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (43,0)-(43,24))
         │   ├── receiver: ∅
@@ -717,7 +737,8 @@
         │   │   │   └── closing_loc: (43,21)-(43,22) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (43,1)-(43,2) = "{"
-        │   │   └── closing_loc: (43,23)-(43,24) = "}"
+        │   │   ├── closing_loc: (43,23)-(43,24) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (45,0)-(45,27))
         │   ├── receiver: ∅
@@ -770,7 +791,8 @@
         │   │   │   └── closing_loc: (45,24)-(45,25) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (45,1)-(45,2) = "{"
-        │   │   └── closing_loc: (45,26)-(45,27) = "}"
+        │   │   ├── closing_loc: (45,26)-(45,27) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (47,0)-(47,20))
         │   ├── receiver: ∅
@@ -814,7 +836,8 @@
         │   │   │   └── closing_loc: (47,17)-(47,18) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (47,1)-(47,2) = "{"
-        │   │   └── closing_loc: (47,19)-(47,20) = "}"
+        │   │   ├── closing_loc: (47,19)-(47,20) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (49,0)-(49,9))
         │   ├── receiver: ∅
@@ -849,7 +872,8 @@
         │   │   │   └── closing_loc: (49,6)-(49,7) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (49,1)-(49,2) = "{"
-        │   │   └── closing_loc: (49,8)-(49,9) = "}"
+        │   │   ├── closing_loc: (49,8)-(49,9) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (51,0)-(51,8))
         │   ├── receiver: ∅
@@ -880,7 +904,8 @@
         │   │   │   └── closing_loc: (51,5)-(51,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (51,1)-(51,2) = "{"
-        │   │   └── closing_loc: (51,7)-(51,8) = "}"
+        │   │   ├── closing_loc: (51,7)-(51,8) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (53,0)-(53,8))
         │   ├── receiver: ∅
@@ -911,7 +936,8 @@
         │   │   │   └── closing_loc: (53,5)-(53,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (53,1)-(53,2) = "{"
-        │   │   └── closing_loc: (53,7)-(53,8) = "}"
+        │   │   ├── closing_loc: (53,7)-(53,8) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (55,0)-(55,8))
         │   ├── receiver: ∅
@@ -942,7 +968,8 @@
         │   │   │   └── closing_loc: (55,5)-(55,6) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (55,1)-(55,2) = "{"
-        │   │   └── closing_loc: (55,7)-(55,8) = "}"
+        │   │   ├── closing_loc: (55,7)-(55,8) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (57,0)-(57,17))
         │   ├── receiver: ∅
@@ -981,7 +1008,8 @@
         │   │   │   └── closing_loc: (57,14)-(57,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (57,1)-(57,2) = "{"
-        │   │   └── closing_loc: (57,16)-(57,17) = "}"
+        │   │   ├── closing_loc: (57,16)-(57,17) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (59,0)-(59,32))
         │   ├── receiver: ∅
@@ -1030,7 +1058,8 @@
         │   │   │   └── closing_loc: (59,29)-(59,30) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (59,1)-(59,2) = "{"
-        │   │   └── closing_loc: (59,31)-(59,32) = "}"
+        │   │   ├── closing_loc: (59,31)-(59,32) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (61,0)-(61,11))
         │   ├── receiver: ∅
@@ -1062,7 +1091,8 @@
         │   │   │   └── closing_loc: (61,8)-(61,9) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (61,1)-(61,2) = "{"
-        │   │   └── closing_loc: (61,10)-(61,11) = "}"
+        │   │   ├── closing_loc: (61,10)-(61,11) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (63,0)-(63,14))
         │   ├── receiver: ∅
@@ -1102,7 +1132,8 @@
         │   │   │   └── closing_loc: (63,11)-(63,12) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (63,1)-(63,2) = "{"
-        │   │   └── closing_loc: (63,13)-(63,14) = "}"
+        │   │   ├── closing_loc: (63,13)-(63,14) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (65,0)-(65,18))
         │   ├── receiver: ∅
@@ -1146,7 +1177,8 @@
         │   │   │   └── closing_loc: (65,15)-(65,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (65,1)-(65,2) = "{"
-        │   │   └── closing_loc: (65,17)-(65,18) = "}"
+        │   │   ├── closing_loc: (65,17)-(65,18) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (67,0)-(67,21))
         │   ├── receiver: ∅
@@ -1192,7 +1224,8 @@
         │   │   │   └── closing_loc: (67,18)-(67,19) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (67,1)-(67,2) = "{"
-        │   │   └── closing_loc: (67,20)-(67,21) = "}"
+        │   │   ├── closing_loc: (67,20)-(67,21) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (69,0)-(69,17))
         │   ├── receiver: ∅
@@ -1234,7 +1267,8 @@
         │   │   │   └── closing_loc: (69,14)-(69,15) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (69,1)-(69,2) = "{"
-        │   │   └── closing_loc: (69,16)-(69,17) = "}"
+        │   │   ├── closing_loc: (69,16)-(69,17) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (71,0)-(71,7))
             ├── receiver: ∅
@@ -1255,5 +1289,6 @@
             │   │   └── closing_loc: (71,4)-(71,5) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (71,1)-(71,2) = "{"
-            │   └── closing_loc: (71,6)-(71,7) = "}"
+            │   ├── closing_loc: (71,6)-(71,7) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/break_block.txt b/test/prism/snapshots/whitequark/break_block.txt
index d6d6347eda..7c9bc9ffb5 100644
--- a/test/prism/snapshots/whitequark/break_block.txt
+++ b/test/prism/snapshots/whitequark/break_block.txt
@@ -34,7 +34,8 @@
             │   │       │   ├── parameters: ∅
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │       │   └── closing_loc: (1,17)-(1,20) = "end"
+            │   │       │   ├── closing_loc: (1,17)-(1,20) = "end"
+            │   │       │   └── numbered_parameters: 0
             │   │       └── 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 fd7380e15d..bba6eb68ea 100644
--- a/test/prism/snapshots/whitequark/bug_435.txt
+++ b/test/prism/snapshots/whitequark/bug_435.txt
@@ -32,6 +32,7 @@
             │       │           │   ├── locals: (length: 0)
             │       │           │   ├── opening_loc: ∅
             │       │           │   └── closing_loc: ∅
-            │       │           └── body: ∅
+            │       │           ├── body: ∅
+            │       │           └── numbered_parameters: 0
             │       └── 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 a056bd2ce3..2a6f1f1cb2 100644
--- a/test/prism/snapshots/whitequark/bug_447.txt
+++ b/test/prism/snapshots/whitequark/bug_447.txt
@@ -25,7 +25,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,5)-(1,7) = "do"
-        │   │   └── closing_loc: (1,8)-(1,11) = "end"
+        │   │   ├── closing_loc: (1,8)-(1,11) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,14))
             ├── receiver: ∅
@@ -51,5 +52,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (3,8)-(3,10) = "do"
-            │   └── closing_loc: (3,11)-(3,14) = "end"
+            │   ├── closing_loc: (3,11)-(3,14) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_452.txt b/test/prism/snapshots/whitequark/bug_452.txt
index 435181b643..b5969ac2f0 100644
--- a/test/prism/snapshots/whitequark/bug_452.txt
+++ b/test/prism/snapshots/whitequark/bug_452.txt
@@ -58,5 +58,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,30)-(1,32) = "do"
-            │   └── closing_loc: (1,34)-(1,37) = "end"
+            │   ├── closing_loc: (1,34)-(1,37) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_466.txt b/test/prism/snapshots/whitequark/bug_466.txt
index 2b4af5d72c..2823887dc8 100644
--- a/test/prism/snapshots/whitequark/bug_466.txt
+++ b/test/prism/snapshots/whitequark/bug_466.txt
@@ -63,5 +63,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,20)-(1,22) = "do"
-            │   └── closing_loc: (1,24)-(1,27) = "end"
+            │   ├── closing_loc: (1,24)-(1,27) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_481.txt b/test/prism/snapshots/whitequark/bug_481.txt
index dbd7de7a0c..da7f527e3f 100644
--- a/test/prism/snapshots/whitequark/bug_481.txt
+++ b/test/prism/snapshots/whitequark/bug_481.txt
@@ -45,5 +45,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,22)-(1,24) = "do"
-            │   └── closing_loc: (1,25)-(1,28) = "end"
+            │   ├── closing_loc: (1,25)-(1,28) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt b/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
index 94c39e2021..a1873ad116 100644
--- a/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
+++ b/test/prism/snapshots/whitequark/bug_cmd_string_lookahead.txt
@@ -26,5 +26,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   └── closing_loc: (1,14)-(1,17) = "end"
+            │   ├── closing_loc: (1,14)-(1,17) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_cmdarg.txt b/test/prism/snapshots/whitequark/bug_cmdarg.txt
index 93eafdb3a3..e1023d93c1 100644
--- a/test/prism/snapshots/whitequark/bug_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/bug_cmdarg.txt
@@ -76,25 +76,27 @@
             │   │               │   ├── 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"
-            │   │               │               └── flags: ∅
+            │   │               │   ├── 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
             │   │               └── 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 65bb6e8668..8731f258c9 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,7 +35,8 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,23)-(1,25) = "do"
-            │   │       │           │   └── closing_loc: (1,26)-(1,29) = "end"
+            │   │       │           │   ├── closing_loc: (1,26)-(1,29) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── 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 42600a495a..e2be2a966a 100644
--- a/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
+++ b/test/prism/snapshots/whitequark/bug_do_block_in_cmdarg.txt
@@ -30,7 +30,8 @@
             │   │       │           │   ├── parameters: ∅
             │   │       │           │   ├── body: ∅
             │   │       │           │   ├── opening_loc: (1,10)-(1,12) = "do"
-            │   │       │           │   └── closing_loc: (1,13)-(1,16) = "end"
+            │   │       │           │   ├── closing_loc: (1,13)-(1,16) = "end"
+            │   │       │           │   └── numbered_parameters: 0
             │   │       │           └── 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 2604e721bc..43effe5e47 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,7 +42,8 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (1,19)-(1,21) = "do"
-        │   │   │       │   │   │   │   └── closing_loc: (1,22)-(1,25) = "end"
+        │   │   │       │   │   │   │   ├── closing_loc: (1,22)-(1,25) = "end"
+        │   │   │       │   │   │   │   └── numbered_parameters: 0
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: ∅
         │   │   │       │   └── @ AssocNode (location: (1,27)-(1,41))
@@ -67,7 +68,8 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (1,35)-(1,37) = "do"
-        │   │   │       │       │   │   └── closing_loc: (1,38)-(1,41) = "end"
+        │   │   │       │       │   │   ├── closing_loc: (1,38)-(1,41) = "end"
+        │   │   │       │       │   │   └── numbered_parameters: 0
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (1,41)-(1,42) = "}"
@@ -108,7 +110,8 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (3,17)-(3,19) = "do"
-        │   │   │       │   │   │   │   └── closing_loc: (3,20)-(3,23) = "end"
+        │   │   │       │   │   │   │   ├── closing_loc: (3,20)-(3,23) = "end"
+        │   │   │       │   │   │   │   └── numbered_parameters: 0
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: (3,9)-(3,11) = "**"
         │   │   │       │   └── @ AssocNode (location: (3,25)-(3,39))
@@ -133,7 +136,8 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (3,33)-(3,35) = "do"
-        │   │   │       │       │   │   └── closing_loc: (3,36)-(3,39) = "end"
+        │   │   │       │       │   │   ├── closing_loc: (3,36)-(3,39) = "end"
+        │   │   │       │       │   │   └── numbered_parameters: 0
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (3,39)-(3,40) = "}"
@@ -180,7 +184,8 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (5,20)-(5,22) = "do"
-        │   │   │       │   │   │   │   └── closing_loc: (5,23)-(5,26) = "end"
+        │   │   │       │   │   │   │   ├── closing_loc: (5,23)-(5,26) = "end"
+        │   │   │       │   │   │   │   └── numbered_parameters: 0
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: (5,12)-(5,14) = "=>"
         │   │   │       │   └── @ AssocNode (location: (5,28)-(5,42))
@@ -205,7 +210,8 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (5,36)-(5,38) = "do"
-        │   │   │       │       │   │   └── closing_loc: (5,39)-(5,42) = "end"
+        │   │   │       │       │   │   ├── closing_loc: (5,39)-(5,42) = "end"
+        │   │   │       │       │   │   └── numbered_parameters: 0
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (5,42)-(5,43) = "}"
@@ -252,7 +258,8 @@
         │   │   │       │   │   │   │   ├── parameters: ∅
         │   │   │       │   │   │   │   ├── body: ∅
         │   │   │       │   │   │   │   ├── opening_loc: (7,17)-(7,19) = "do"
-        │   │   │       │   │   │   │   └── closing_loc: (7,20)-(7,23) = "end"
+        │   │   │       │   │   │   │   ├── closing_loc: (7,20)-(7,23) = "end"
+        │   │   │       │   │   │   │   └── numbered_parameters: 0
         │   │   │       │   │   │   └── flags: ∅
         │   │   │       │   │   └── operator_loc: ∅
         │   │   │       │   └── @ AssocNode (location: (7,25)-(7,39))
@@ -277,7 +284,8 @@
         │   │   │       │       │   │   ├── parameters: ∅
         │   │   │       │       │   │   ├── body: ∅
         │   │   │       │       │   │   ├── opening_loc: (7,33)-(7,35) = "do"
-        │   │   │       │       │   │   └── closing_loc: (7,36)-(7,39) = "end"
+        │   │   │       │       │   │   ├── closing_loc: (7,36)-(7,39) = "end"
+        │   │   │       │       │   │   └── numbered_parameters: 0
         │   │   │       │       │   └── flags: ∅
         │   │   │       │       └── operator_loc: ∅
         │   │   │       └── closing_loc: (7,39)-(7,40) = "}"
@@ -318,7 +326,8 @@
             │   │       │   │   │   │   ├── parameters: ∅
             │   │       │   │   │   │   ├── body: ∅
             │   │       │   │   │   │   ├── opening_loc: (9,14)-(9,16) = "do"
-            │   │       │   │   │   │   └── closing_loc: (9,17)-(9,20) = "end"
+            │   │       │   │   │   │   ├── closing_loc: (9,17)-(9,20) = "end"
+            │   │       │   │   │   │   └── numbered_parameters: 0
             │   │       │   │   │   └── flags: ∅
             │   │       │   │   ├── value:
             │   │       │   │   │   @ CallNode (location: (9,24)-(9,35))
@@ -335,7 +344,8 @@
             │   │       │   │   │   │   ├── parameters: ∅
             │   │       │   │   │   │   ├── body: ∅
             │   │       │   │   │   │   ├── opening_loc: (9,29)-(9,31) = "do"
-            │   │       │   │   │   │   └── closing_loc: (9,32)-(9,35) = "end"
+            │   │       │   │   │   │   ├── closing_loc: (9,32)-(9,35) = "end"
+            │   │       │   │   │   │   └── numbered_parameters: 0
             │   │       │   │   │   └── flags: ∅
             │   │       │   │   └── operator_loc: (9,21)-(9,23) = "=>"
             │   │       │   └── @ AssocNode (location: (9,37)-(9,51))
@@ -360,7 +370,8 @@
             │   │       │       │   │   ├── parameters: ∅
             │   │       │       │   │   ├── body: ∅
             │   │       │       │   │   ├── opening_loc: (9,45)-(9,47) = "do"
-            │   │       │       │   │   └── closing_loc: (9,48)-(9,51) = "end"
+            │   │       │       │   │   ├── closing_loc: (9,48)-(9,51) = "end"
+            │   │       │       │   │   └── numbered_parameters: 0
             │   │       │       │   └── 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 ccf2fb56fc..ef7b07168f 100644
--- a/test/prism/snapshots/whitequark/bug_heredoc_do.txt
+++ b/test/prism/snapshots/whitequark/bug_heredoc_do.txt
@@ -26,5 +26,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,11)-(1,13) = "do"
-            │   └── closing_loc: (3,0)-(3,3) = "end"
+            │   ├── closing_loc: (3,0)-(3,3) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/bug_lambda_leakage.txt b/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
index 2fd9d0fc0b..651ce872b5 100644
--- a/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
+++ b/test/prism/snapshots/whitequark/bug_lambda_leakage.txt
@@ -24,7 +24,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ 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 cf5806d0a2..2322b0d671 100644
--- a/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt
+++ b/test/prism/snapshots/whitequark/class_definition_in_while_cond.txt
@@ -35,7 +35,8 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (1,29)-(1,31) = "do"
-        │   │   │           │   │   └── closing_loc: (1,32)-(1,35) = "end"
+        │   │   │           │   │   ├── closing_loc: (1,32)-(1,35) = "end"
+        │   │   │           │   │   └── numbered_parameters: 0
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (1,23)-(1,24) = "="
         │   │   └── end_keyword_loc: (1,37)-(1,40) = "end"
@@ -73,7 +74,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,25)-(3,27) = "do"
-        │   │   │           │   └── closing_loc: (3,28)-(3,31) = "end"
+        │   │   │           │   ├── closing_loc: (3,28)-(3,31) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: (3,33)-(3,36) = "end"
         │   ├── statements:
@@ -117,7 +119,8 @@
         │   │   │           │   │   ├── parameters: ∅
         │   │   │           │   │   ├── body: ∅
         │   │   │           │   │   ├── opening_loc: (5,24)-(5,26) = "do"
-        │   │   │           │   │   └── closing_loc: (5,27)-(5,30) = "end"
+        │   │   │           │   │   ├── closing_loc: (5,27)-(5,30) = "end"
+        │   │   │           │   │   └── numbered_parameters: 0
         │   │   │           │   └── flags: ∅
         │   │   │           └── operator_loc: (5,18)-(5,19) = "="
         │   │   ├── end_keyword_loc: (5,32)-(5,35) = "end"
@@ -158,7 +161,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (7,21)-(7,23) = "do"
-            │   │           │   └── closing_loc: (7,24)-(7,27) = "end"
+            │   │           │   ├── closing_loc: (7,24)-(7,27) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── 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 2b5902db1a..cdd5018f69 100644
--- a/test/prism/snapshots/whitequark/kwnilarg.txt
+++ b/test/prism/snapshots/whitequark/kwnilarg.txt
@@ -25,7 +25,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,2)-(1,3) = "("
         │   │   └── closing_loc: (1,8)-(1,9) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ DefNode (location: (3,0)-(3,17))
         │   ├── name: :f
         │   ├── name_loc: (3,4)-(3,5) = "f"
@@ -80,5 +81,6 @@
             │   │   └── closing_loc: (5,10)-(5,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (5,2)-(5,3) = "{"
-            │   └── closing_loc: (5,12)-(5,13) = "}"
+            │   ├── closing_loc: (5,12)-(5,13) = "}"
+            │   └── numbered_parameters: 0
             └── 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 2b85b2980e..4301270e33 100644
--- a/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
+++ b/test/prism/snapshots/whitequark/lbrace_arg_after_command_args.txt
@@ -46,8 +46,10 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │           │   └── closing_loc: (1,17)-(1,20) = "end"
+            │   │           │   ├── closing_loc: (1,17)-(1,20) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   └── closing_loc: (1,21)-(1,22) = "}"
+            │   ├── closing_loc: (1,21)-(1,22) = "}"
+            │   └── numbered_parameters: 0
             └── 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 cbb114dd69..4890377405 100644
--- a/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt
+++ b/test/prism/snapshots/whitequark/method_definition_in_while_cond.txt
@@ -34,7 +34,8 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (1,22)-(1,24) = "do"
-        │   │   │   │           │   └── closing_loc: (1,25)-(1,28) = "end"
+        │   │   │   │           │   ├── closing_loc: (1,25)-(1,28) = "end"
+        │   │   │   │           │   └── numbered_parameters: 0
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -82,7 +83,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,19)-(3,21) = "do"
-        │   │   │           │   └── closing_loc: (3,22)-(3,25) = "end"
+        │   │   │           │   ├── closing_loc: (3,22)-(3,25) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   ├── locals: []
         │   │   ├── def_keyword_loc: (3,6)-(3,9) = "def"
@@ -130,7 +132,8 @@
         │   │   │   │           │   ├── parameters: ∅
         │   │   │   │           │   ├── body: ∅
         │   │   │   │           │   ├── opening_loc: (5,27)-(5,29) = "do"
-        │   │   │   │           │   └── closing_loc: (5,30)-(5,33) = "end"
+        │   │   │   │           │   ├── closing_loc: (5,30)-(5,33) = "end"
+        │   │   │   │           │   └── numbered_parameters: 0
         │   │   │   │           └── flags: ∅
         │   │   │   ├── rest: ∅
         │   │   │   ├── posts: (length: 0)
@@ -179,7 +182,8 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (7,24)-(7,26) = "do"
-            │   │           │   └── closing_loc: (7,27)-(7,30) = "end"
+            │   │           │   ├── closing_loc: (7,27)-(7,30) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── 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 b49d3dc4a2..59cbb69289 100644
--- a/test/prism/snapshots/whitequark/next_block.txt
+++ b/test/prism/snapshots/whitequark/next_block.txt
@@ -34,7 +34,8 @@
             │   │       │   ├── parameters: ∅
             │   │       │   ├── body: ∅
             │   │       │   ├── opening_loc: (1,13)-(1,15) = "do"
-            │   │       │   └── closing_loc: (1,16)-(1,19) = "end"
+            │   │       │   ├── closing_loc: (1,16)-(1,19) = "end"
+            │   │       │   └── numbered_parameters: 0
             │   │       └── 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 a19cedc599..79f8edd8cd 100644
--- a/test/prism/snapshots/whitequark/numbered_args_after_27.txt
+++ b/test/prism/snapshots/whitequark/numbered_args_after_27.txt
@@ -9,56 +9,58 @@
         │   ├── 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: ∅
+        │   ├── 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
         ├── @ 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: ∅
+        │   ├── 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
         ├── @ CallNode (location: (5,0)-(5,16))
         │   ├── receiver: ∅
         │   ├── call_operator_loc: ∅
@@ -94,7 +96,8 @@
         │   │   │           ├── block: ∅
         │   │   │           └── flags: ∅
         │   │   ├── opening_loc: (5,2)-(5,4) = "do"
-        │   │   └── closing_loc: (5,13)-(5,16) = "end"
+        │   │   ├── closing_loc: (5,13)-(5,16) = "end"
+        │   │   └── numbered_parameters: 9
         │   └── flags: ∅
         └── @ CallNode (location: (7,0)-(7,13))
             ├── receiver: ∅
@@ -131,5 +134,6 @@
             │   │           ├── block: ∅
             │   │           └── flags: ∅
             │   ├── opening_loc: (7,2)-(7,3) = "{"
-            │   └── closing_loc: (7,12)-(7,13) = "}"
+            │   ├── closing_loc: (7,12)-(7,13) = "}"
+            │   └── numbered_parameters: 9
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_272.txt b/test/prism/snapshots/whitequark/parser_bug_272.txt
index f8f29f8137..2b5448c9fc 100644
--- a/test/prism/snapshots/whitequark/parser_bug_272.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_272.txt
@@ -37,5 +37,6 @@
             │   │   └── closing_loc: (1,10)-(1,11) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   └── closing_loc: (1,12)-(1,15) = "end"
+            │   ├── closing_loc: (1,12)-(1,15) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_507.txt b/test/prism/snapshots/whitequark/parser_bug_507.txt
index d2a3d3cba8..ea146fbabe 100644
--- a/test/prism/snapshots/whitequark/parser_bug_507.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_507.txt
@@ -31,5 +31,6 @@
             │   │   ├── locals: (length: 0)
             │   │   ├── opening_loc: ∅
             │   │   └── closing_loc: ∅
-            │   └── body: ∅
+            │   ├── body: ∅
+            │   └── numbered_parameters: 0
             └── 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 f875dc8116..4377aff91e 100644
--- a/test/prism/snapshots/whitequark/parser_bug_525.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_525.txt
@@ -56,8 +56,10 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,21)-(1,23) = "do"
-            │   │           │   └── closing_loc: (1,24)-(1,27) = "end"
+            │   │           │   ├── closing_loc: (1,24)-(1,27) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,12)-(1,14) = "do"
-            │   └── closing_loc: (1,29)-(1,32) = "end"
+            │   ├── closing_loc: (1,29)-(1,32) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_604.txt b/test/prism/snapshots/whitequark/parser_bug_604.txt
index 12a05c31cb..66e2c3ae92 100644
--- a/test/prism/snapshots/whitequark/parser_bug_604.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_604.txt
@@ -53,5 +53,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,8)-(1,10) = "do"
-            │   └── closing_loc: (1,11)-(1,14) = "end"
+            │   ├── closing_loc: (1,11)-(1,14) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/parser_bug_645.txt b/test/prism/snapshots/whitequark/parser_bug_645.txt
index 4eee6234c1..f737157284 100644
--- a/test/prism/snapshots/whitequark/parser_bug_645.txt
+++ b/test/prism/snapshots/whitequark/parser_bug_645.txt
@@ -31,4 +31,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (1,3)-(1,4) = "("
             │   └── closing_loc: (1,10)-(1,11) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/procarg0.txt b/test/prism/snapshots/whitequark/procarg0.txt
index 62eaaca68f..c5da626acb 100644
--- a/test/prism/snapshots/whitequark/procarg0.txt
+++ b/test/prism/snapshots/whitequark/procarg0.txt
@@ -40,7 +40,8 @@
         │   │   │   └── closing_loc: (1,15)-(1,16) = "|"
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,2)-(1,3) = "{"
-        │   │   └── closing_loc: (1,17)-(1,18) = "}"
+        │   │   ├── closing_loc: (1,17)-(1,18) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (3,0)-(3,11))
             ├── receiver: ∅
@@ -71,5 +72,6 @@
             │   │   └── closing_loc: (3,8)-(3,9) = "|"
             │   ├── body: ∅
             │   ├── opening_loc: (3,2)-(3,3) = "{"
-            │   └── closing_loc: (3,10)-(3,11) = "}"
+            │   ├── closing_loc: (3,10)-(3,11) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt b/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
index 72b6842f42..0208513ee3 100644
--- a/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
+++ b/test/prism/snapshots/whitequark/rescue_in_lambda_block.txt
@@ -9,18 +9,19 @@
             ├── 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"
+            ├── 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
diff --git a/test/prism/snapshots/whitequark/rescue_without_begin_end.txt b/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
index c997d99d46..f2591d2d20 100644
--- a/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
+++ b/test/prism/snapshots/whitequark/rescue_without_begin_end.txt
@@ -55,5 +55,6 @@
             │   │   ├── ensure_clause: ∅
             │   │   └── end_keyword_loc: (1,27)-(1,30) = "end"
             │   ├── opening_loc: (1,5)-(1,7) = "do"
-            │   └── closing_loc: (1,27)-(1,30) = "end"
+            │   ├── closing_loc: (1,27)-(1,30) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/return_block.txt b/test/prism/snapshots/whitequark/return_block.txt
index f963bedff1..453ed258f8 100644
--- a/test/prism/snapshots/whitequark/return_block.txt
+++ b/test/prism/snapshots/whitequark/return_block.txt
@@ -35,6 +35,7 @@
                 │       │   ├── parameters: ∅
                 │       │   ├── body: ∅
                 │       │   ├── opening_loc: (1,15)-(1,17) = "do"
-                │       │   └── closing_loc: (1,18)-(1,21) = "end"
+                │       │   ├── closing_loc: (1,18)-(1,21) = "end"
+                │       │   └── numbered_parameters: 0
                 │       └── flags: ∅
                 └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_10653.txt b/test/prism/snapshots/whitequark/ruby_bug_10653.txt
index 35a3e966bd..4fac961de1 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_10653.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_10653.txt
@@ -25,7 +25,8 @@
         │   │           │   ├── parameters: ∅
         │   │           │   ├── body: ∅
         │   │           │   ├── opening_loc: (1,14)-(1,16) = "do"
-        │   │           │   └── closing_loc: (1,17)-(1,20) = "end"
+        │   │           │   ├── closing_loc: (1,17)-(1,20) = "end"
+        │   │           │   └── numbered_parameters: 0
         │   │           └── flags: ∅
         │   ├── consequent:
         │   │   @ ElseNode (location: (1,21)-(1,33))
@@ -47,7 +48,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (1,27)-(1,29) = "do"
-        │   │   │           │   └── closing_loc: (1,30)-(1,33) = "end"
+        │   │   │           │   ├── closing_loc: (1,30)-(1,33) = "end"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: ∅
         │   └── end_keyword_loc: ∅
@@ -73,7 +75,8 @@
         │   │           │   ├── parameters: ∅
         │   │           │   ├── body: ∅
         │   │           │   ├── opening_loc: (3,14)-(3,15) = "{"
-        │   │           │   └── closing_loc: (3,15)-(3,16) = "}"
+        │   │           │   ├── closing_loc: (3,15)-(3,16) = "}"
+        │   │           │   └── numbered_parameters: 0
         │   │           └── flags: ∅
         │   ├── consequent:
         │   │   @ ElseNode (location: (3,17)-(3,25))
@@ -95,7 +98,8 @@
         │   │   │           │   ├── parameters: ∅
         │   │   │           │   ├── body: ∅
         │   │   │           │   ├── opening_loc: (3,23)-(3,24) = "{"
-        │   │   │           │   └── closing_loc: (3,24)-(3,25) = "}"
+        │   │   │           │   ├── closing_loc: (3,24)-(3,25) = "}"
+        │   │   │           │   └── numbered_parameters: 0
         │   │   │           └── flags: ∅
         │   │   └── end_keyword_loc: ∅
         │   └── end_keyword_loc: ∅
@@ -156,7 +160,8 @@
             │           │   │           ├── block: ∅
             │           │   │           └── flags: ∅
             │           │   ├── opening_loc: (5,13)-(5,15) = "do"
-            │           │   └── closing_loc: (5,24)-(5,27) = "end"
+            │           │   ├── closing_loc: (5,24)-(5,27) = "end"
+            │           │   └── numbered_parameters: 0
             │           └── 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 1d8e922a1f..a794a6f5a7 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11107.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11107.txt
@@ -23,25 +23,27 @@
             │   │       │   ├── 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"
-            │   │                   └── flags: ∅
+            │   │       ├── 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
             │   └── 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 6f74ac0d6f..29850868cd 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11380.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11380.txt
@@ -18,14 +18,15 @@
             │   │   │   ├── 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"
+            │   │   │   ├── 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
             │   │   └── @ KeywordHashNode (location: (1,17)-(1,21))
             │   │       └── elements: (length: 1)
             │   │           └── @ AssocNode (location: (1,17)-(1,21))
@@ -47,5 +48,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,22)-(1,24) = "do"
-            │   └── closing_loc: (1,25)-(1,28) = "end"
+            │   ├── closing_loc: (1,25)-(1,28) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873.txt b/test/prism/snapshots/whitequark/ruby_bug_11873.txt
index d094841587..b4a4173dc1 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873.txt
@@ -62,7 +62,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,14)-(1,16) = "do"
-        │   │   └── closing_loc: (1,17)-(1,20) = "end"
+        │   │   ├── closing_loc: (1,17)-(1,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,20))
         │   ├── receiver: ∅
@@ -123,7 +124,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,14)-(3,16) = "do"
-        │   │   └── closing_loc: (3,17)-(3,20) = "end"
+        │   │   ├── closing_loc: (3,17)-(3,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,21))
         │   ├── receiver: ∅
@@ -184,7 +186,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,15)-(5,17) = "do"
-        │   │   └── closing_loc: (5,18)-(5,21) = "end"
+        │   │   ├── closing_loc: (5,18)-(5,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,21))
         │   ├── receiver: ∅
@@ -245,7 +248,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,15)-(7,17) = "do"
-        │   │   └── closing_loc: (7,18)-(7,21) = "end"
+        │   │   ├── closing_loc: (7,18)-(7,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,21))
         │   ├── receiver: ∅
@@ -306,7 +310,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,15)-(9,17) = "do"
-        │   │   └── closing_loc: (9,18)-(9,21) = "end"
+        │   │   ├── closing_loc: (9,18)-(9,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,22))
         │   ├── receiver: ∅
@@ -367,7 +372,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,16)-(11,18) = "do"
-        │   │   └── closing_loc: (11,19)-(11,22) = "end"
+        │   │   ├── closing_loc: (11,19)-(11,22) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,20))
         │   ├── receiver: ∅
@@ -417,7 +423,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (13,3)-(13,4) = "{"
-        │   │   │   │   │   └── closing_loc: (13,7)-(13,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (13,7)-(13,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ StringNode (location: (13,10)-(13,13))
         │   │   │       ├── flags: ∅
@@ -433,7 +440,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,14)-(13,16) = "do"
-        │   │   └── closing_loc: (13,17)-(13,20) = "end"
+        │   │   ├── closing_loc: (13,17)-(13,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,20))
         │   ├── receiver: ∅
@@ -483,7 +491,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (15,3)-(15,4) = "{"
-        │   │   │   │   │   └── closing_loc: (15,7)-(15,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (15,7)-(15,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (15,10)-(15,13))
         │   │   │       ├── opening_loc: (15,10)-(15,11) = "/"
@@ -499,7 +508,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,14)-(15,16) = "do"
-        │   │   └── closing_loc: (15,17)-(15,20) = "end"
+        │   │   ├── closing_loc: (15,17)-(15,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,21))
         │   ├── receiver: ∅
@@ -549,7 +559,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (17,3)-(17,4) = "{"
-        │   │   │   │   │   └── closing_loc: (17,7)-(17,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (17,7)-(17,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (17,10)-(17,14))
         │   │   │       ├── opening_loc: (17,10)-(17,11) = "/"
@@ -565,7 +576,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,15)-(17,17) = "do"
-        │   │   └── closing_loc: (17,18)-(17,21) = "end"
+        │   │   ├── closing_loc: (17,18)-(17,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(19,21))
         │   ├── receiver: ∅
@@ -615,7 +627,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (19,3)-(19,4) = "{"
-        │   │   │   │   │   └── closing_loc: (19,8)-(19,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (19,8)-(19,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ StringNode (location: (19,11)-(19,14))
         │   │   │       ├── flags: ∅
@@ -631,7 +644,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,15)-(19,17) = "do"
-        │   │   └── closing_loc: (19,18)-(19,21) = "end"
+        │   │   ├── closing_loc: (19,18)-(19,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (21,0)-(21,21))
         │   ├── receiver: ∅
@@ -681,7 +695,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │   │   │   │   └── closing_loc: (21,8)-(21,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (21,8)-(21,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RegularExpressionNode (location: (21,11)-(21,14))
         │   │   │       ├── opening_loc: (21,11)-(21,12) = "/"
@@ -697,7 +712,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (21,15)-(21,17) = "do"
-        │   │   └── closing_loc: (21,18)-(21,21) = "end"
+        │   │   ├── closing_loc: (21,18)-(21,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (23,0)-(23,22))
             ├── receiver: ∅
@@ -747,7 +763,8 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (23,3)-(23,4) = "{"
-            │   │   │   │   └── closing_loc: (23,8)-(23,9) = "}"
+            │   │   │   │   ├── closing_loc: (23,8)-(23,9) = "}"
+            │   │   │   │   └── numbered_parameters: 0
             │   │   │   └── flags: ∅
             │   │   └── @ RegularExpressionNode (location: (23,11)-(23,15))
             │   │       ├── opening_loc: (23,11)-(23,12) = "/"
@@ -763,5 +780,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (23,16)-(23,18) = "do"
-            │   └── closing_loc: (23,19)-(23,22) = "end"
+            │   ├── closing_loc: (23,19)-(23,22) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt b/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
index 77da1d947c..45857739c5 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873_a.txt
@@ -58,7 +58,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,12)-(1,14) = "do"
-        │   │   └── closing_loc: (1,15)-(1,18) = "end"
+        │   │   ├── closing_loc: (1,15)-(1,18) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,20))
         │   ├── receiver: ∅
@@ -114,7 +115,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,14)-(3,16) = "do"
-        │   │   └── closing_loc: (3,17)-(3,20) = "end"
+        │   │   ├── closing_loc: (3,17)-(3,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,21))
         │   ├── receiver: ∅
@@ -172,7 +174,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,15)-(5,17) = "do"
-        │   │   └── closing_loc: (5,18)-(5,21) = "end"
+        │   │   ├── closing_loc: (5,18)-(5,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,21))
         │   ├── receiver: ∅
@@ -230,7 +233,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (7,15)-(7,17) = "do"
-        │   │   └── closing_loc: (7,18)-(7,21) = "end"
+        │   │   ├── closing_loc: (7,18)-(7,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (9,0)-(9,19))
         │   ├── receiver: ∅
@@ -290,7 +294,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,13)-(9,15) = "do"
-        │   │   └── closing_loc: (9,16)-(9,19) = "end"
+        │   │   ├── closing_loc: (9,16)-(9,19) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,19))
         │   ├── receiver: ∅
@@ -347,7 +352,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (11,13)-(11,15) = "do"
-        │   │   └── closing_loc: (11,16)-(11,19) = "end"
+        │   │   ├── closing_loc: (11,16)-(11,19) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (13,0)-(13,21))
         │   ├── receiver: ∅
@@ -403,7 +409,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (13,15)-(13,17) = "do"
-        │   │   └── closing_loc: (13,18)-(13,21) = "end"
+        │   │   ├── closing_loc: (13,18)-(13,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (15,0)-(15,22))
         │   ├── receiver: ∅
@@ -461,7 +468,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (15,16)-(15,18) = "do"
-        │   │   └── closing_loc: (15,19)-(15,22) = "end"
+        │   │   ├── closing_loc: (15,19)-(15,22) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (17,0)-(17,22))
         │   ├── receiver: ∅
@@ -519,7 +527,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (17,16)-(17,18) = "do"
-        │   │   └── closing_loc: (17,19)-(17,22) = "end"
+        │   │   ├── closing_loc: (17,19)-(17,22) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (19,0)-(19,20))
         │   ├── receiver: ∅
@@ -579,7 +588,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (19,14)-(19,16) = "do"
-        │   │   └── closing_loc: (19,17)-(19,20) = "end"
+        │   │   ├── closing_loc: (19,17)-(19,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (21,0)-(21,18))
         │   ├── receiver: ∅
@@ -629,7 +639,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (21,3)-(21,4) = "{"
-        │   │   │   │   │   └── closing_loc: (21,7)-(21,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (21,7)-(21,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ IntegerNode (location: (21,10)-(21,11))
         │   │   │       └── flags: decimal
@@ -641,7 +652,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (21,12)-(21,14) = "do"
-        │   │   └── closing_loc: (21,15)-(21,18) = "end"
+        │   │   ├── closing_loc: (21,15)-(21,18) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (23,0)-(23,20))
         │   ├── receiver: ∅
@@ -691,7 +703,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (23,3)-(23,4) = "{"
-        │   │   │   │   │   └── closing_loc: (23,7)-(23,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (23,7)-(23,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ FloatNode (location: (23,10)-(23,13))
         │   │   └── flags: ∅
@@ -702,7 +715,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (23,14)-(23,16) = "do"
-        │   │   └── closing_loc: (23,17)-(23,20) = "end"
+        │   │   ├── closing_loc: (23,17)-(23,20) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (25,0)-(25,21))
         │   ├── receiver: ∅
@@ -752,7 +766,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (25,3)-(25,4) = "{"
-        │   │   │   │   │   └── closing_loc: (25,7)-(25,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (25,7)-(25,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ ImaginaryNode (location: (25,10)-(25,14))
         │   │   │       └── numeric:
@@ -765,7 +780,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (25,15)-(25,17) = "do"
-        │   │   └── closing_loc: (25,18)-(25,21) = "end"
+        │   │   ├── closing_loc: (25,18)-(25,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (27,0)-(27,21))
         │   ├── receiver: ∅
@@ -815,7 +831,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (27,3)-(27,4) = "{"
-        │   │   │   │   │   └── closing_loc: (27,7)-(27,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (27,7)-(27,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RationalNode (location: (27,10)-(27,14))
         │   │   │       └── numeric:
@@ -828,7 +845,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (27,15)-(27,17) = "do"
-        │   │   └── closing_loc: (27,18)-(27,21) = "end"
+        │   │   ├── closing_loc: (27,18)-(27,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (29,0)-(29,19))
         │   ├── receiver: ∅
@@ -878,7 +896,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (29,3)-(29,4) = "{"
-        │   │   │   │   │   └── closing_loc: (29,7)-(29,8) = "}"
+        │   │   │   │   │   ├── closing_loc: (29,7)-(29,8) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ SymbolNode (location: (29,10)-(29,12))
         │   │   │       ├── opening_loc: (29,10)-(29,11) = ":"
@@ -893,7 +912,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (29,13)-(29,15) = "do"
-        │   │   └── closing_loc: (29,16)-(29,19) = "end"
+        │   │   ├── closing_loc: (29,16)-(29,19) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (31,0)-(31,19))
         │   ├── receiver: ∅
@@ -943,7 +963,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (31,3)-(31,4) = "{"
-        │   │   │   │   │   └── closing_loc: (31,8)-(31,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (31,8)-(31,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ IntegerNode (location: (31,11)-(31,12))
         │   │   │       └── flags: decimal
@@ -955,7 +976,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (31,13)-(31,15) = "do"
-        │   │   └── closing_loc: (31,16)-(31,19) = "end"
+        │   │   ├── closing_loc: (31,16)-(31,19) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (33,0)-(33,21))
         │   ├── receiver: ∅
@@ -1005,7 +1027,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (33,3)-(33,4) = "{"
-        │   │   │   │   │   └── closing_loc: (33,8)-(33,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (33,8)-(33,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ FloatNode (location: (33,11)-(33,14))
         │   │   └── flags: ∅
@@ -1016,7 +1039,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (33,15)-(33,17) = "do"
-        │   │   └── closing_loc: (33,18)-(33,21) = "end"
+        │   │   ├── closing_loc: (33,18)-(33,21) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (35,0)-(35,22))
         │   ├── receiver: ∅
@@ -1066,7 +1090,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (35,3)-(35,4) = "{"
-        │   │   │   │   │   └── closing_loc: (35,8)-(35,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (35,8)-(35,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ ImaginaryNode (location: (35,11)-(35,15))
         │   │   │       └── numeric:
@@ -1079,7 +1104,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (35,16)-(35,18) = "do"
-        │   │   └── closing_loc: (35,19)-(35,22) = "end"
+        │   │   ├── closing_loc: (35,19)-(35,22) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (37,0)-(37,22))
         │   ├── receiver: ∅
@@ -1129,7 +1155,8 @@
         │   │   │   │   │   │           ├── block: ∅
         │   │   │   │   │   │           └── flags: ∅
         │   │   │   │   │   ├── opening_loc: (37,3)-(37,4) = "{"
-        │   │   │   │   │   └── closing_loc: (37,8)-(37,9) = "}"
+        │   │   │   │   │   ├── closing_loc: (37,8)-(37,9) = "}"
+        │   │   │   │   │   └── numbered_parameters: 0
         │   │   │   │   └── flags: ∅
         │   │   │   └── @ RationalNode (location: (37,11)-(37,15))
         │   │   │       └── numeric:
@@ -1142,7 +1169,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (37,16)-(37,18) = "do"
-        │   │   └── closing_loc: (37,19)-(37,22) = "end"
+        │   │   ├── closing_loc: (37,19)-(37,22) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (39,0)-(39,20))
             ├── receiver: ∅
@@ -1192,7 +1220,8 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (39,3)-(39,4) = "{"
-            │   │   │   │   └── closing_loc: (39,8)-(39,9) = "}"
+            │   │   │   │   ├── closing_loc: (39,8)-(39,9) = "}"
+            │   │   │   │   └── numbered_parameters: 0
             │   │   │   └── flags: ∅
             │   │   └── @ SymbolNode (location: (39,11)-(39,13))
             │   │       ├── opening_loc: (39,11)-(39,12) = ":"
@@ -1207,5 +1236,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (39,14)-(39,16) = "do"
-            │   └── closing_loc: (39,17)-(39,20) = "end"
+            │   ├── closing_loc: (39,17)-(39,20) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt b/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
index 6f052e5e6f..c649fe4cb9 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_11873_b.txt
@@ -74,7 +74,8 @@
             │   │   │   │   │           ├── block: ∅
             │   │   │   │   │           └── flags: ∅
             │   │   │   │   ├── opening_loc: (1,3)-(1,4) = "{"
-            │   │   │   │   └── closing_loc: (1,12)-(1,13) = "}"
+            │   │   │   │   ├── closing_loc: (1,12)-(1,13) = "}"
+            │   │   │   │   └── numbered_parameters: 0
             │   │   │   └── flags: ∅
             │   │   └── @ CallNode (location: (1,15)-(1,18))
             │   │       ├── receiver: ∅
@@ -94,5 +95,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,19)-(1,21) = "do"
-            │   └── closing_loc: (1,22)-(1,25) = "end"
+            │   ├── closing_loc: (1,22)-(1,25) = "end"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_13547.txt b/test/prism/snapshots/whitequark/ruby_bug_13547.txt
index becb34f0bb..b2805a83c7 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_13547.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_13547.txt
@@ -27,5 +27,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   └── closing_loc: (1,8)-(1,9) = "}"
+            │   ├── closing_loc: (1,8)-(1,9) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_14690.txt b/test/prism/snapshots/whitequark/ruby_bug_14690.txt
index bccfa5d878..8282a2f3a9 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_14690.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_14690.txt
@@ -52,8 +52,10 @@
             │   │           │   ├── parameters: ∅
             │   │           │   ├── body: ∅
             │   │           │   ├── opening_loc: (1,14)-(1,16) = "do"
-            │   │           │   └── closing_loc: (1,18)-(1,21) = "end"
+            │   │           │   ├── closing_loc: (1,18)-(1,21) = "end"
+            │   │           │   └── numbered_parameters: 0
             │   │           └── flags: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   └── closing_loc: (1,22)-(1,23) = "}"
+            │   ├── closing_loc: (1,22)-(1,23) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/ruby_bug_15789.txt b/test/prism/snapshots/whitequark/ruby_bug_15789.txt
index b9d793179a..6346624157 100644
--- a/test/prism/snapshots/whitequark/ruby_bug_15789.txt
+++ b/test/prism/snapshots/whitequark/ruby_bug_15789.txt
@@ -34,12 +34,13 @@
         │   │   │       │   │   │           ├── 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
+        │   │   │       │   │   │           ├── body:
+        │   │   │       │   │   │           │   @ StatementsNode (location: (1,12)-(1,14))
+        │   │   │       │   │   │           │   └── body: (length: 1)
+        │   │   │       │   │   │           │       └── @ LocalVariableReadNode (location: (1,12)-(1,14))
+        │   │   │       │   │   │           │           ├── name: :_1
+        │   │   │       │   │   │           │           └── depth: 0
+        │   │   │       │   │   │           └── numbered_parameters: 1
         │   │   │       │   │   ├── rest: ∅
         │   │   │       │   │   ├── posts: (length: 0)
         │   │   │       │   │   ├── keywords: (length: 0)
@@ -48,12 +49,13 @@
         │   │   │       │   ├── 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
+        │   │   │       ├── body:
+        │   │   │       │   @ StatementsNode (location: (1,18)-(1,19))
+        │   │   │       │   └── body: (length: 1)
+        │   │   │       │       └── @ LocalVariableReadNode (location: (1,18)-(1,19))
+        │   │   │       │           ├── name: :a
+        │   │   │       │           └── depth: 0
+        │   │   │       └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── closing_loc: ∅
         │   ├── block: ∅
@@ -91,23 +93,25 @@
             │   │       │   │   │           ├── 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
+            │   │       │   │   │           ├── body:
+            │   │       │   │   │           │   @ StatementsNode (location: (3,11)-(3,13))
+            │   │       │   │   │           │   └── body: (length: 1)
+            │   │       │   │   │           │       └── @ LocalVariableReadNode (location: (3,11)-(3,13))
+            │   │       │   │   │           │           ├── name: :_1
+            │   │       │   │   │           │           └── depth: 0
+            │   │       │   │   │           └── numbered_parameters: 1
             │   │       │   │   ├── 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
+            │   │       ├── body:
+            │   │       │   @ StatementsNode (location: (3,17)-(3,18))
+            │   │       │   └── body: (length: 1)
+            │   │       │       └── @ LocalVariableReadNode (location: (3,17)-(3,18))
+            │   │       │           ├── name: :a
+            │   │       │           └── depth: 0
+            │   │       └── numbered_parameters: 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 40e59aa278..42f90902a8 100644
--- a/test/prism/snapshots/whitequark/send_block_chain_cmd.txt
+++ b/test/prism/snapshots/whitequark/send_block_chain_cmd.txt
@@ -24,7 +24,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (1,7)-(1,9) = "do"
-        │   │   │   └── closing_loc: (1,10)-(1,13) = "end"
+        │   │   │   ├── closing_loc: (1,10)-(1,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (1,13)-(1,14) = "."
         │   ├── name: :fun
@@ -68,7 +69,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (3,7)-(3,9) = "do"
-        │   │   │   └── closing_loc: (3,10)-(3,13) = "end"
+        │   │   │   ├── closing_loc: (3,10)-(3,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (3,13)-(3,14) = "."
         │   ├── name: :fun
@@ -95,7 +97,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,22)-(3,24) = "do"
-        │   │   └── closing_loc: (3,25)-(3,28) = "end"
+        │   │   ├── closing_loc: (3,25)-(3,28) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,20))
         │   ├── receiver:
@@ -118,7 +121,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (5,7)-(5,9) = "do"
-        │   │   │   └── closing_loc: (5,10)-(5,13) = "end"
+        │   │   │   ├── closing_loc: (5,10)-(5,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (5,13)-(5,14) = "."
         │   ├── name: :fun
@@ -132,7 +136,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,18)-(5,19) = "{"
-        │   │   └── closing_loc: (5,19)-(5,20) = "}"
+        │   │   ├── closing_loc: (5,19)-(5,20) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (7,0)-(7,22))
         │   ├── receiver:
@@ -155,7 +160,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (7,7)-(7,9) = "do"
-        │   │   │   └── closing_loc: (7,10)-(7,13) = "end"
+        │   │   │   ├── closing_loc: (7,10)-(7,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (7,13)-(7,14) = "."
         │   ├── name: :fun
@@ -199,7 +205,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (9,7)-(9,9) = "do"
-        │   │   │   └── closing_loc: (9,10)-(9,13) = "end"
+        │   │   │   ├── closing_loc: (9,10)-(9,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (9,13)-(9,14) = "."
         │   ├── name: :fun
@@ -226,7 +233,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (9,23)-(9,24) = "{"
-        │   │   └── closing_loc: (9,24)-(9,25) = "}"
+        │   │   ├── closing_loc: (9,24)-(9,25) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (11,0)-(11,22))
         │   ├── receiver:
@@ -249,7 +257,8 @@
         │   │   │   ├── parameters: ∅
         │   │   │   ├── body: ∅
         │   │   │   ├── opening_loc: (11,7)-(11,9) = "do"
-        │   │   │   └── closing_loc: (11,10)-(11,13) = "end"
+        │   │   │   ├── closing_loc: (11,10)-(11,13) = "end"
+        │   │   │   └── numbered_parameters: 0
         │   │   └── flags: ∅
         │   ├── call_operator_loc: (11,13)-(11,15) = "::"
         │   ├── name: :fun
@@ -293,7 +302,8 @@
             │   │   ├── parameters: ∅
             │   │   ├── body: ∅
             │   │   ├── opening_loc: (13,7)-(13,9) = "do"
-            │   │   └── closing_loc: (13,10)-(13,13) = "end"
+            │   │   ├── closing_loc: (13,10)-(13,13) = "end"
+            │   │   └── numbered_parameters: 0
             │   └── 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 ed736996b5..16b12fb6ec 100644
--- a/test/prism/snapshots/whitequark/send_block_conditional.txt
+++ b/test/prism/snapshots/whitequark/send_block_conditional.txt
@@ -27,5 +27,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,9)-(1,10) = "{"
-            │   └── closing_loc: (1,10)-(1,11) = "}"
+            │   ├── closing_loc: (1,10)-(1,11) = "}"
+            │   └── numbered_parameters: 0
             └── flags: safe_navigation
diff --git a/test/prism/snapshots/whitequark/send_lambda.txt b/test/prism/snapshots/whitequark/send_lambda.txt
index b39992d868..acacf50035 100644
--- a/test/prism/snapshots/whitequark/send_lambda.txt
+++ b/test/prism/snapshots/whitequark/send_lambda.txt
@@ -26,18 +26,21 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         ├── @ 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: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ 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: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/send_lambda_args.txt b/test/prism/snapshots/whitequark/send_lambda_args.txt
index 0e5dd9a7c0..30f859313b 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args.txt
@@ -24,7 +24,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: (1,3)-(1,4) = "("
         │   │   └── closing_loc: (1,5)-(1,6) = ")"
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ LambdaNode (location: (3,0)-(3,9))
             ├── locals: [:a]
             ├── operator_loc: (3,0)-(3,2) = "->"
@@ -46,4 +47,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: (3,2)-(3,3) = "("
             │   └── closing_loc: (3,4)-(3,5) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt b/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
index 913c9a9bb0..6ffc7d8a62 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args_noparen.txt
@@ -28,7 +28,8 @@
         │   │   ├── locals: (length: 0)
         │   │   ├── opening_loc: ∅
         │   │   └── closing_loc: ∅
-        │   └── body: ∅
+        │   ├── body: ∅
+        │   └── numbered_parameters: 0
         └── @ LambdaNode (location: (3,0)-(3,9))
             ├── locals: [:a]
             ├── operator_loc: (3,0)-(3,2) = "->"
@@ -51,4 +52,5 @@
             │   ├── locals: (length: 0)
             │   ├── opening_loc: ∅
             │   └── closing_loc: ∅
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt b/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
index 2e1160427c..cf5893c6d2 100644
--- a/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_args_shadow.txt
@@ -28,4 +28,5 @@
             │   │       └── name: :bar
             │   ├── opening_loc: (1,2)-(1,3) = "("
             │   └── closing_loc: (1,14)-(1,15) = ")"
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/send_lambda_legacy.txt b/test/prism/snapshots/whitequark/send_lambda_legacy.txt
index 3a64e941b6..c03950391a 100644
--- a/test/prism/snapshots/whitequark/send_lambda_legacy.txt
+++ b/test/prism/snapshots/whitequark/send_lambda_legacy.txt
@@ -9,4 +9,5 @@
             ├── opening_loc: (1,2)-(1,3) = "{"
             ├── closing_loc: (1,4)-(1,5) = "}"
             ├── parameters: ∅
-            └── body: ∅
+            ├── body: ∅
+            └── numbered_parameters: 0
diff --git a/test/prism/snapshots/whitequark/send_self_block.txt b/test/prism/snapshots/whitequark/send_self_block.txt
index 7bbee61474..7e095907dc 100644
--- a/test/prism/snapshots/whitequark/send_self_block.txt
+++ b/test/prism/snapshots/whitequark/send_self_block.txt
@@ -17,7 +17,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,4)-(1,6) = "do"
-        │   │   └── closing_loc: (1,7)-(1,10) = "end"
+        │   │   ├── closing_loc: (1,7)-(1,10) = "end"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,7))
         │   ├── receiver: ∅
@@ -33,7 +34,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,4)-(3,5) = "{"
-        │   │   └── closing_loc: (3,6)-(3,7) = "}"
+        │   │   ├── closing_loc: (3,6)-(3,7) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (5,0)-(5,9))
         │   ├── receiver: ∅
@@ -49,7 +51,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (5,6)-(5,7) = "{"
-        │   │   └── closing_loc: (5,8)-(5,9) = "}"
+        │   │   ├── closing_loc: (5,8)-(5,9) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (7,0)-(7,10))
             ├── receiver: ∅
@@ -70,5 +73,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (7,7)-(7,8) = "{"
-            │   └── closing_loc: (7,9)-(7,10) = "}"
+            │   ├── closing_loc: (7,9)-(7,10) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/space_args_arg_block.txt b/test/prism/snapshots/whitequark/space_args_arg_block.txt
index b870fc66d7..3b46484380 100644
--- a/test/prism/snapshots/whitequark/space_args_arg_block.txt
+++ b/test/prism/snapshots/whitequark/space_args_arg_block.txt
@@ -38,7 +38,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (1,12)-(1,13) = "{"
-        │   │   └── closing_loc: (1,13)-(1,14) = "}"
+        │   │   ├── closing_loc: (1,13)-(1,14) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         ├── @ CallNode (location: (3,0)-(3,15))
         │   ├── receiver:
@@ -75,7 +76,8 @@
         │   │   ├── parameters: ∅
         │   │   ├── body: ∅
         │   │   ├── opening_loc: (3,13)-(3,14) = "{"
-        │   │   └── closing_loc: (3,14)-(3,15) = "}"
+        │   │   ├── closing_loc: (3,14)-(3,15) = "}"
+        │   │   └── numbered_parameters: 0
         │   └── flags: ∅
         └── @ CallNode (location: (5,0)-(5,10))
             ├── receiver: ∅
@@ -102,5 +104,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (5,8)-(5,9) = "{"
-            │   └── closing_loc: (5,9)-(5,10) = "}"
+            │   ├── closing_loc: (5,9)-(5,10) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/space_args_block.txt b/test/prism/snapshots/whitequark/space_args_block.txt
index 28fcecc97f..50dd1391ba 100644
--- a/test/prism/snapshots/whitequark/space_args_block.txt
+++ b/test/prism/snapshots/whitequark/space_args_block.txt
@@ -24,5 +24,6 @@
             │   ├── parameters: ∅
             │   ├── body: ∅
             │   ├── opening_loc: (1,7)-(1,8) = "{"
-            │   └── closing_loc: (1,8)-(1,9) = "}"
+            │   ├── closing_loc: (1,8)-(1,9) = "}"
+            │   └── numbered_parameters: 0
             └── flags: ∅
diff --git a/test/prism/snapshots/whitequark/super_block.txt b/test/prism/snapshots/whitequark/super_block.txt
index 124dd22c53..b631bb1240 100644
--- a/test/prism/snapshots/whitequark/super_block.txt
+++ b/test/prism/snapshots/whitequark/super_block.txt
@@ -10,7 +10,8 @@
         │       ├── parameters: ∅
         │       ├── body: ∅
         │       ├── opening_loc: (1,6)-(1,8) = "do"
-        │       └── closing_loc: (1,9)-(1,12) = "end"
+        │       ├── closing_loc: (1,9)-(1,12) = "end"
+        │       └── numbered_parameters: 0
         └── @ SuperNode (location: (3,0)-(3,21))
             ├── keyword_loc: (3,0)-(3,5) = "super"
             ├── lparen_loc: ∅
@@ -45,4 +46,5 @@
                 ├── parameters: ∅
                 ├── body: ∅
                 ├── opening_loc: (3,15)-(3,17) = "do"
-                └── closing_loc: (3,18)-(3,21) = "end"
+                ├── closing_loc: (3,18)-(3,21) = "end"
+                └── numbered_parameters: 0