diff --git a/config.yml b/config.yml
index c922a34925c..8774262417b 100644
--- a/config.yml
+++ b/config.yml
@@ -329,6 +329,8 @@ flags:
     values:
       - name: SAFE_NAVIGATION
         comment: "&. operator"
+      - name: VARIABLE_CALL
+        comment: "a call that could have been a local variable"
   - name: RangeNodeFlags
     values:
       - name: EXCLUDE_END
diff --git a/src/yarp.c b/src/yarp.c
index 6958862fe62..4e4817af509 100644
--- a/src/yarp.c
+++ b/src/yarp.c
@@ -1236,7 +1236,7 @@ yp_call_node_unary_create(yp_parser_t *parser, yp_token_t *operator, yp_node_t *
 // Allocate and initialize a new CallNode node from a call to a method name
 // without a receiver that could also have been a local variable read.
 static yp_call_node_t *
-yp_call_node_vcall_create(yp_parser_t *parser, yp_token_t *message) {
+yp_call_node_variable_call_create(yp_parser_t *parser, yp_token_t *message) {
     yp_call_node_t *node = yp_call_node_create(parser);
 
     node->base.location.start = message->start;
@@ -1245,19 +1245,16 @@ yp_call_node_vcall_create(yp_parser_t *parser, yp_token_t *message) {
     node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);
 
     yp_string_shared_init(&node->name, message->start, message->end);
+    node->flags |= YP_CALL_NODE_FLAGS_VARIABLE_CALL;
+
     return node;
 }
 
 // Returns whether or not this call node is a "vcall" (a call to a method name
 // without a receiver that could also have been a local variable read).
 static inline bool
-yp_call_node_vcall_p(yp_call_node_t *node) {
-    return (
-        (node->opening_loc.start == NULL) &&
-        (node->arguments == NULL) &&
-        (node->block == NULL) &&
-        (node->receiver == NULL)
-    );
+yp_call_node_variable_call_p(yp_call_node_t *node) {
+    return node->flags & YP_CALL_NODE_FLAGS_VARIABLE_CALL;
 }
 
 // Allocate and initialize a new CallOperatorAndWriteNode node.
@@ -8840,10 +8837,14 @@ parse_block(yp_parser_t *parser) {
 }
 
 // Parse a list of arguments and their surrounding parentheses if they are
-// present.
-static void
+// present. It returns true if it found any pieces of arguments (parentheses,
+// arguments, or blocks).
+static bool
 parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accepts_block) {
+    bool found = false;
+
     if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
+        found |= true;
         arguments->opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
 
         if (accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
@@ -8859,6 +8860,7 @@ parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accept
             arguments->closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
         }
     } else if ((token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 2, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR)) && !match_type_p(parser, YP_TOKEN_BRACE_LEFT)) {
+        found |= true;
         yp_accepts_block_stack_push(parser, false);
 
         // If we get here, then the subsequent token cannot be used as an infix
@@ -8875,11 +8877,15 @@ parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accept
     // the arguments.
     if (accepts_block) {
         if (accept(parser, YP_TOKEN_BRACE_LEFT)) {
+            found |= true;
             arguments->block = parse_block(parser);
         } else if (yp_accepts_block_stack_p(parser) && accept(parser, YP_TOKEN_KEYWORD_DO)) {
+            found |= true;
             arguments->block = parse_block(parser);
         }
     }
+
+    return found;
 }
 
 static inline yp_node_t *
@@ -9341,7 +9347,7 @@ parse_alias_argument(yp_parser_t *parser, bool first) {
 
 // Parse an identifier into either a local variable read or a call.
 static yp_node_t *
-parse_vcall(yp_parser_t *parser) {
+parse_variable_call(yp_parser_t *parser) {
     int depth;
 
     if (
@@ -9353,7 +9359,7 @@ parse_vcall(yp_parser_t *parser) {
         return (yp_node_t *) yp_local_variable_read_node_create(parser, &parser->previous, (uint32_t) depth);
     }
 
-    return (yp_node_t *) yp_call_node_vcall_create(parser, &parser->previous);
+    return (yp_node_t *) yp_call_node_variable_call_create(parser, &parser->previous);
 }
 
 static inline yp_token_t
@@ -10463,36 +10469,42 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
         case YP_TOKEN_IDENTIFIER: {
             parser_lex(parser);
             yp_token_t identifier = parser->previous;
-            yp_node_t *node = parse_vcall(parser);
+            yp_node_t *node = parse_variable_call(parser);
 
             if (YP_NODE_TYPE_P(node, YP_NODE_CALL_NODE)) {
-                // If parse_vcall returned with a call node, then we know the identifier
-                // is not in the local table. In that case we need to check if there are
-                // arguments following the identifier.
+                // If parse_variable_call returned with a call node, then we
+                // know the identifier is not in the local table. In that case
+                // we need to check if there are arguments following the
+                // identifier.
                 yp_call_node_t *call = (yp_call_node_t *) node;
                 yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
-                parse_arguments_list(parser, &arguments, true);
-
-                call->opening_loc = arguments.opening_loc;
-                call->arguments = arguments.arguments;
-                call->closing_loc = arguments.closing_loc;
-                call->block = arguments.block;
 
-                if (arguments.block != NULL) {
-                    call->base.location.end = arguments.block->base.location.end;
-                } else if (arguments.closing_loc.start == NULL) {
-                    if (arguments.arguments != NULL) {
-                        call->base.location.end = arguments.arguments->base.location.end;
+                if (parse_arguments_list(parser, &arguments, true)) {
+                    // Since we found arguments, we need to turn off the
+                    // variable call bit in the flags.
+                    call->flags ^= YP_CALL_NODE_FLAGS_VARIABLE_CALL;
+
+                    call->opening_loc = arguments.opening_loc;
+                    call->arguments = arguments.arguments;
+                    call->closing_loc = arguments.closing_loc;
+                    call->block = arguments.block;
+
+                    if (arguments.block != NULL) {
+                        call->base.location.end = arguments.block->base.location.end;
+                    } else if (arguments.closing_loc.start == NULL) {
+                        if (arguments.arguments != NULL) {
+                            call->base.location.end = arguments.arguments->base.location.end;
+                        } else {
+                            call->base.location.end = call->message_loc.end;
+                        }
                     } else {
-                        call->base.location.end = call->message_loc.end;
+                        call->base.location.end = arguments.closing_loc.end;
                     }
-                } else {
-                    call->base.location.end = arguments.closing_loc.end;
                 }
             } else {
-                // Otherwise, we know the identifier is in the local table. This can
-                // still be a method call if it is followed by arguments or a block, so
-                // we need to check for that here.
+                // Otherwise, we know the identifier is in the local table. This
+                // can still be a method call if it is followed by arguments or
+                // a block, so we need to check for that here.
                 if (
                     (binding_power <= YP_BINDING_POWER_ASSIGNMENT && (token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 2, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR))) ||
                     (yp_accepts_block_stack_p(parser) && match_any_type_p(parser, 2, YP_TOKEN_KEYWORD_DO, YP_TOKEN_BRACE_LEFT))
@@ -10974,7 +10986,7 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
                     parser_lex(parser);
 
                     if (match_any_type_p(parser, 2, YP_TOKEN_DOT, YP_TOKEN_COLON_COLON)) {
-                        receiver = parse_vcall(parser);
+                        receiver = parse_variable_call(parser);
 
                         lex_state_set(parser, YP_LEX_STATE_FNAME);
                         parser_lex(parser);
@@ -12178,12 +12190,12 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
         case YP_TOKEN_EQUAL: {
             switch (YP_NODE_TYPE(node)) {
                 case YP_NODE_CALL_NODE: {
-                    // If we have no arguments to the call node and we need this to be a
-                    // target then this is either a method call or a local variable write.
-                    // This _must_ happen before the value is parsed because it could be
-                    // referenced in the value.
+                    // If we have no arguments to the call node and we need this
+                    // to be a target then this is either a method call or a
+                    // local variable write. This _must_ happen before the value
+                    // is parsed because it could be referenced in the value.
                     yp_call_node_t *call_node = (yp_call_node_t *) node;
-                    if (yp_call_node_vcall_p(call_node)) {
+                    if (yp_call_node_variable_call_p(call_node)) {
                         yp_parser_local_add_location(parser, call_node->message_loc.start, call_node->message_loc.end);
                     }
                 }
@@ -12237,7 +12249,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
                     // If we have a vcall (a method with no arguments and no
                     // receiver that could have been a local variable) then we
                     // will transform it into a local variable write.
-                    if (yp_call_node_vcall_p(call_node)) {
+                    if (yp_call_node_variable_call_p(call_node)) {
                         yp_location_t message_loc = call_node->message_loc;
                         yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
 
@@ -12342,7 +12354,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
                     // If we have a vcall (a method with no arguments and no
                     // receiver that could have been a local variable) then we
                     // will transform it into a local variable write.
-                    if (yp_call_node_vcall_p(call_node)) {
+                    if (yp_call_node_variable_call_p(call_node)) {
                         yp_location_t message_loc = call_node->message_loc;
                         yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
 
@@ -12457,7 +12469,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
                     // If we have a vcall (a method with no arguments and no
                     // receiver that could have been a local variable) then we
                     // will transform it into a local variable write.
-                    if (yp_call_node_vcall_p(call_node)) {
+                    if (yp_call_node_variable_call_p(call_node)) {
                         yp_location_t message_loc = call_node->message_loc;
                         yp_parser_local_add_location(parser, message_loc.start, message_loc.end);
 
diff --git a/test/errors_test.rb b/test/errors_test.rb
index e705a6423c3..9c282a2dbc0 100644
--- a/test/errors_test.rb
+++ b/test/errors_test.rb
@@ -294,28 +294,10 @@ def test_double_splat_followed_by_splat_argument
       nil,
       Location(),
       Location(),
-      ArgumentsNode(
-        [KeywordHashNode(
-           [AssocSplatNode(
-              CallNode(
-                nil,
-                nil,
-                Location(),
-                nil,
-                nil,
-                nil,
-                nil,
-                0,
-                "kwargs"
-              ),
-              Location()
-            )]
-         ),
-         SplatNode(
-           Location(),
-           CallNode(nil, nil, Location(), nil, nil, nil, nil, 0, "args")
-         )]
-      ),
+      ArgumentsNode([
+        KeywordHashNode([AssocSplatNode(expression("kwargs"), Location())]),
+        SplatNode(Location(), expression("args"))
+      ]),
       Location(),
       nil,
       0,
@@ -362,19 +344,16 @@ def test_splat_argument_after_keyword_argument
       nil,
       Location(),
       Location(),
-      ArgumentsNode(
-        [KeywordHashNode(
-           [AssocNode(
-              SymbolNode(nil, Location(), Location(), "foo"),
-              CallNode(nil, nil, Location(), nil, nil, nil, nil, 0, "bar"),
-              nil
-            )]
-         ),
-         SplatNode(
-           Location(),
-           CallNode(nil, nil, Location(), nil, nil, nil, nil, 0, "args")
-         )]
-      ),
+      ArgumentsNode([
+        KeywordHashNode(
+          [AssocNode(
+            SymbolNode(nil, Location(), Location(), "foo"),
+            expression("bar"),
+            nil
+          )]
+        ),
+        SplatNode(Location(), expression("args"))
+      ]),
       Location(),
       nil,
       0,
diff --git a/test/snapshots/arithmetic.txt b/test/snapshots/arithmetic.txt
index 7de7a714b60..c82760a7e39 100644
--- a/test/snapshots/arithmetic.txt
+++ b/test/snapshots/arithmetic.txt
@@ -8,7 +8,7 @@ ProgramNode(0...39)(
        nil,
        ArgumentsNode(4...8)(
          [CallNode(4...8)(
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "bar"),
+            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar"),
             nil,
             (4...5),
             nil,
@@ -26,7 +26,7 @@ ProgramNode(0...39)(
      ),
      CallNode(10...18)(
        CallNode(10...14)(
-         CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+         CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
          nil,
          (10...11),
          nil,
@@ -40,7 +40,7 @@ ProgramNode(0...39)(
        (14...15),
        nil,
        ArgumentsNode(15...18)(
-         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
@@ -49,7 +49,7 @@ ProgramNode(0...39)(
      ),
      CallNode(20...29)(
        CallNode(20...24)(
-         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "foo"),
+         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
          nil,
          (20...21),
          nil,
@@ -63,7 +63,7 @@ ProgramNode(0...39)(
        (24...26),
        nil,
        ArgumentsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
@@ -85,7 +85,7 @@ ProgramNode(0...39)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             nil,
diff --git a/test/snapshots/arrays.txt b/test/snapshots/arrays.txt
index 219573ccba6..ec251f08277 100644
--- a/test/snapshots/arrays.txt
+++ b/test/snapshots/arrays.txt
@@ -4,19 +4,19 @@ ProgramNode(0...511)(
     [ArrayNode(0...4)(
        [SplatNode(1...3)(
           (1...2),
-          CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a")
+          CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")
         )],
        (0...1),
        (3...4)
      ),
      CallNode(6...29)(
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo"),
+       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
        nil,
        (9...19),
        (9...10),
        ArgumentsNode(10...29)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 0, "bar"),
-          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 0, "baz"),
+         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "bar"),
+          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "baz"),
           ArrayNode(22...29)(
             [IntegerNode(22...23)(),
              IntegerNode(25...26)(),
@@ -75,7 +75,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              ),
              CallNode(108...111)(
@@ -86,7 +86,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              ),
              (105...107)
@@ -105,7 +105,7 @@ ProgramNode(0...511)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil,
@@ -120,7 +120,7 @@ ProgramNode(0...511)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -141,7 +141,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           ),
           CallNode(130...133)(
@@ -152,7 +152,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "qux"
           )]
        ),
@@ -171,7 +171,7 @@ ProgramNode(0...511)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil,
@@ -186,7 +186,7 @@ ProgramNode(0...511)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -207,7 +207,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -226,7 +226,7 @@ ProgramNode(0...511)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -241,7 +241,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           CallNode(164...167)(
@@ -252,7 +252,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -270,7 +270,7 @@ ProgramNode(0...511)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -285,7 +285,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           CallNode(179...182)(
@@ -296,7 +296,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           ),
           CallNode(186...189)(
@@ -307,7 +307,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "qux"
           )]
        ),
@@ -326,7 +326,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           nil,
@@ -347,7 +347,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           nil,
@@ -377,7 +377,7 @@ ProgramNode(0...511)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -393,7 +393,7 @@ ProgramNode(0...511)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             nil,
@@ -408,7 +408,7 @@ ProgramNode(0...511)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "baz"
                ),
                CallNode(229...232)(
@@ -419,7 +419,7 @@ ProgramNode(0...511)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "qux"
                )]
             ),
@@ -443,7 +443,7 @@ ProgramNode(0...511)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -458,7 +458,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -476,7 +476,7 @@ ProgramNode(0...511)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -491,7 +491,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           CallNode(256...259)(
@@ -502,7 +502,7 @@ ProgramNode(0...511)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -532,7 +532,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "kw"
              ),
              (270...272)
@@ -553,7 +553,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "kw"
              ),
              (281...283)
@@ -574,7 +574,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "kw"
              ),
              (292...294)
@@ -592,7 +592,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "kw"
              ),
              (304...306)
@@ -612,7 +612,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              ),
              CallNode(322...325)(
@@ -623,7 +623,7 @@ ProgramNode(0...511)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              ),
              (319...321)
diff --git a/test/snapshots/begin_ensure.txt b/test/snapshots/begin_ensure.txt
index b82cf6a007a..e04a1236df3 100644
--- a/test/snapshots/begin_ensure.txt
+++ b/test/snapshots/begin_ensure.txt
@@ -4,14 +4,14 @@ ProgramNode(0...94)(
     [BeginNode(0...20)(
        (0...5),
        StatementsNode(6...7)(
-         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "a")]
+         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
        EnsureNode(8...20)(
          (8...14),
          StatementsNode(15...16)(
-           [CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 0, "b")]
+           [CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "b")]
          ),
          (17...20)
        ),
@@ -20,14 +20,14 @@ ProgramNode(0...94)(
      BeginNode(22...46)(
        (22...27),
        StatementsNode(29...30)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 0, "a")]
+         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
        EnsureNode(32...46)(
          (32...38),
          StatementsNode(40...41)(
-           [CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 0, "b")]
+           [CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 2, "b")]
          ),
          (43...46)
        ),
@@ -36,14 +36,14 @@ ProgramNode(0...94)(
      BeginNode(48...70)(
        (48...53),
        StatementsNode(54...55)(
-         [CallNode(54...55)(nil, nil, (54...55), nil, nil, nil, nil, 0, "a")]
+         [CallNode(54...55)(nil, nil, (54...55), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
        EnsureNode(57...70)(
          (57...63),
          StatementsNode(64...65)(
-           [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 0, "b")]
+           [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "b")]
          ),
          (67...70)
        ),
@@ -52,14 +52,14 @@ ProgramNode(0...94)(
      BeginNode(72...94)(
        (72...77),
        StatementsNode(78...79)(
-         [CallNode(78...79)(nil, nil, (78...79), nil, nil, nil, nil, 0, "a")]
+         [CallNode(78...79)(nil, nil, (78...79), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
        EnsureNode(81...94)(
          (81...87),
          StatementsNode(88...89)(
-           [CallNode(88...89)(nil, nil, (88...89), nil, nil, nil, nil, 0, "b")]
+           [CallNode(88...89)(nil, nil, (88...89), nil, nil, nil, nil, 2, "b")]
          ),
          (91...94)
        ),
diff --git a/test/snapshots/begin_rescue.txt b/test/snapshots/begin_rescue.txt
index 7c8b139dced..f7195f80a08 100644
--- a/test/snapshots/begin_rescue.txt
+++ b/test/snapshots/begin_rescue.txt
@@ -4,7 +4,7 @@ ProgramNode(0...578)(
     [BeginNode(0...33)(
        (0...5),
        StatementsNode(7...8)(
-         [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "a")]
+         [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a")]
        ),
        RescueNode(10...19)(
          (10...16),
@@ -12,14 +12,14 @@ ProgramNode(0...578)(
          nil,
          nil,
          StatementsNode(18...19)(
-           [CallNode(18...19)(nil, nil, (18...19), nil, nil, nil, nil, 0, "b")]
+           [CallNode(18...19)(nil, nil, (18...19), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
        ElseNode(21...33)(
          (21...25),
          StatementsNode(27...28)(
-           [CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 0, "c")]
+           [CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 2, "c")]
          ),
          (30...33)
        ),
@@ -29,7 +29,7 @@ ProgramNode(0...578)(
      BeginNode(35...79)(
        (35...40),
        StatementsNode(42...43)(
-         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 0, "a")]
+         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "a")]
        ),
        RescueNode(45...54)(
          (45...51),
@@ -37,21 +37,21 @@ ProgramNode(0...578)(
          nil,
          nil,
          StatementsNode(53...54)(
-           [CallNode(53...54)(nil, nil, (53...54), nil, nil, nil, nil, 0, "b")]
+           [CallNode(53...54)(nil, nil, (53...54), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
        ElseNode(56...71)(
          (56...60),
          StatementsNode(62...63)(
-           [CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 0, "c")]
+           [CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 2, "c")]
          ),
          (65...71)
        ),
        EnsureNode(65...79)(
          (65...71),
          StatementsNode(73...74)(
-           [CallNode(73...74)(nil, nil, (73...74), nil, nil, nil, nil, 0, "d")]
+           [CallNode(73...74)(nil, nil, (73...74), nil, nil, nil, nil, 2, "d")]
          ),
          (76...79)
        ),
@@ -60,7 +60,7 @@ ProgramNode(0...578)(
      BeginNode(81...92)(
        (81...86),
        StatementsNode(87...88)(
-         [CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 0, "a")]
+         [CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
@@ -78,7 +78,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -98,7 +98,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -118,7 +118,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -138,7 +138,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -156,7 +156,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -174,7 +174,7 @@ ProgramNode(0...578)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -192,7 +192,7 @@ ProgramNode(0...578)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "d"
                 )]
              ),
@@ -215,7 +215,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -233,7 +233,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -251,7 +251,7 @@ ProgramNode(0...578)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -273,7 +273,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -291,7 +291,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -309,7 +309,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -329,7 +329,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -347,7 +347,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -368,7 +368,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -386,7 +386,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -407,7 +407,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -425,7 +425,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -446,7 +446,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -464,7 +464,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -485,7 +485,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -503,7 +503,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -524,7 +524,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -542,7 +542,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -563,7 +563,7 @@ ProgramNode(0...578)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -581,7 +581,7 @@ ProgramNode(0...578)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
diff --git a/test/snapshots/blocks.txt b/test/snapshots/blocks.txt
index 4fcbaace146..3579d99bd75 100644
--- a/test/snapshots/blocks.txt
+++ b/test/snapshots/blocks.txt
@@ -2,12 +2,12 @@ ProgramNode(0...402)(
   [:fork],
   StatementsNode(0...402)(
     [CallNode(0...16)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...8),
        (3...4),
        ArgumentsNode(4...7)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
        ),
        (7...8),
        BlockNode(9...16)(
@@ -22,7 +22,7 @@ ProgramNode(0...402)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -33,12 +33,12 @@ ProgramNode(0...402)(
        "[]"
      ),
      CallNode(18...37)(
-       CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 0, "foo"),
+       CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "foo"),
        nil,
        (21...26),
        (21...22),
        ArgumentsNode(22...25)(
-         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "bar")]
        ),
        (25...26),
        BlockNode(27...37)(
@@ -53,7 +53,7 @@ ProgramNode(0...402)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -64,7 +64,7 @@ ProgramNode(0...402)(
        "[]"
      ),
      CallNode(39...74)(
-       CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 0, "x"),
+       CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "x"),
        (40...41),
        (41...47),
        (47...48),
@@ -119,7 +119,7 @@ ProgramNode(0...402)(
        (88...91),
        nil,
        ArgumentsNode(92...109)(
-         [CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 0, "bar"),
+         [CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 2, "bar"),
           ParenthesesNode(97...109)(
             StatementsNode(98...108)(
               [CallNode(98...108)(
@@ -157,7 +157,7 @@ ProgramNode(0...402)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -186,7 +186,7 @@ ProgramNode(0...402)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "baz"
                )]
             ),
@@ -226,7 +226,7 @@ ProgramNode(0...402)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "b"
                   ),
                   nil,
@@ -342,7 +342,7 @@ ProgramNode(0...402)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -357,7 +357,7 @@ ProgramNode(0...402)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -374,7 +374,7 @@ ProgramNode(0...402)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
diff --git a/test/snapshots/boolean_operators.txt b/test/snapshots/boolean_operators.txt
index 6c3ef5a4a7c..1b8a2aaed91 100644
--- a/test/snapshots/boolean_operators.txt
+++ b/test/snapshots/boolean_operators.txt
@@ -4,20 +4,20 @@ ProgramNode(0...24)(
     [LocalVariableOperatorAndWriteNode(0...7)(
        (0...1),
        (2...5),
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b"),
+       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
        :a
      ),
      LocalVariableOperatorWriteNode(9...15)(
        (9...10),
        (11...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "b"),
+       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "b"),
        :a,
        :+
      ),
      LocalVariableOperatorOrWriteNode(17...24)(
        (17...18),
        (19...22),
-       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 0, "b"),
+       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "b"),
        :a
      )]
   )
diff --git a/test/snapshots/case.txt b/test/snapshots/case.txt
index f1ee1c9c2d2..f041410e3ce 100644
--- a/test/snapshots/case.txt
+++ b/test/snapshots/case.txt
@@ -70,7 +70,7 @@ ProgramNode(0...272)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              )
            )],
@@ -106,7 +106,7 @@ ProgramNode(0...272)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "this"
        ),
        [WhenNode(147...167)(
@@ -131,7 +131,7 @@ ProgramNode(0...272)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              ),
              nil,
@@ -146,7 +146,7 @@ ProgramNode(0...272)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
@@ -173,7 +173,7 @@ ProgramNode(0...272)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "a"
            )],
           nil
@@ -191,7 +191,7 @@ ProgramNode(0...272)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "type"
        ),
        [WhenNode(246...253)(
diff --git a/test/snapshots/classes.txt b/test/snapshots/classes.txt
index 7b65c457ef5..60ab0eadc5e 100644
--- a/test/snapshots/classes.txt
+++ b/test/snapshots/classes.txt
@@ -80,7 +80,7 @@ ProgramNode(0...370)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil,
@@ -158,7 +158,7 @@ ProgramNode(0...370)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          (232...233),
@@ -186,7 +186,7 @@ ProgramNode(0...370)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          (254...255),
diff --git a/test/snapshots/comments.txt b/test/snapshots/comments.txt
index 4b629af138f..e24df47bc83 100644
--- a/test/snapshots/comments.txt
+++ b/test/snapshots/comments.txt
@@ -1,12 +1,12 @@
 ProgramNode(0...118)(
   [],
   StatementsNode(0...118)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
-     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "b"),
-     CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 0, "c"),
-     CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 0, "d"),
+    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
+     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "b"),
+     CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "c"),
+     CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 2, "d"),
      CallNode(31...47)(
-       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 0, "e"),
+       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "e"),
        (45...46),
        (46...47),
        nil,
@@ -17,7 +17,7 @@ ProgramNode(0...118)(
        "f"
      ),
      CallNode(49...64)(
-       CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 0, "g"),
+       CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 2, "g"),
        (62...63),
        (63...64),
        nil,
@@ -28,7 +28,7 @@ ProgramNode(0...118)(
        "h"
      ),
      CallNode(66...80)(
-       CallNode(66...67)(nil, nil, (66...67), nil, nil, nil, nil, 0, "i"),
+       CallNode(66...67)(nil, nil, (66...67), nil, nil, nil, nil, 2, "i"),
        (78...79),
        (79...80),
        nil,
@@ -39,7 +39,7 @@ ProgramNode(0...118)(
        "j"
      ),
      CallNode(82...98)(
-       CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 0, "k"),
+       CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "k"),
        (96...97),
        (97...98),
        nil,
@@ -50,7 +50,7 @@ ProgramNode(0...118)(
        "l"
      ),
      CallNode(100...118)(
-       CallNode(100...101)(nil, nil, (100...101), nil, nil, nil, nil, 0, "m"),
+       CallNode(100...101)(nil, nil, (100...101), nil, nil, nil, nil, 2, "m"),
        (115...117),
        (117...118),
        nil,
diff --git a/test/snapshots/constants.txt b/test/snapshots/constants.txt
index 438f36599c7..43de379df0e 100644
--- a/test/snapshots/constants.txt
+++ b/test/snapshots/constants.txt
@@ -16,7 +16,7 @@ ProgramNode(0...709)(
        (10...12)
      ),
      ConstantPathNode(15...19)(
-       CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 0, "a"),
+       CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "a"),
        ConstantReadNode(18...19)(),
        (16...18)
      ),
@@ -725,7 +725,7 @@ ProgramNode(0...709)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "i"
           )]
        ),
@@ -748,7 +748,7 @@ ProgramNode(0...709)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "w"
           )]
        ),
@@ -771,7 +771,7 @@ ProgramNode(0...709)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "x"
           )]
        ),
diff --git a/test/snapshots/dash_heredocs.txt b/test/snapshots/dash_heredocs.txt
index bc4c90a76f7..64058e2f009 100644
--- a/test/snapshots/dash_heredocs.txt
+++ b/test/snapshots/dash_heredocs.txt
@@ -41,7 +41,7 @@ ProgramNode(0...223)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "b"
              )]
           ),
@@ -74,7 +74,7 @@ ProgramNode(0...223)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "b"
              )]
           ),
@@ -97,7 +97,7 @@ ProgramNode(0...223)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "b"
              )]
           ),
diff --git a/test/snapshots/defined.txt b/test/snapshots/defined.txt
index df02a1d10d7..4d0b377a8a7 100644
--- a/test/snapshots/defined.txt
+++ b/test/snapshots/defined.txt
@@ -21,8 +21,8 @@ ProgramNode(0...78)(
      DefinedNode(45...66)(
        (53...54),
        AndNode(54...65)(
-         CallNode(54...57)(nil, nil, (54...57), nil, nil, nil, nil, 0, "foo"),
-         CallNode(62...65)(nil, nil, (62...65), nil, nil, nil, nil, 0, "bar"),
+         CallNode(54...57)(nil, nil, (54...57), nil, nil, nil, nil, 2, "foo"),
+         CallNode(62...65)(nil, nil, (62...65), nil, nil, nil, nil, 2, "bar"),
          (58...61)
        ),
        (65...66),
diff --git a/test/snapshots/hashes.txt b/test/snapshots/hashes.txt
index 41c166bb278..0dfa9fa2d4f 100644
--- a/test/snapshots/hashes.txt
+++ b/test/snapshots/hashes.txt
@@ -6,13 +6,13 @@ ProgramNode(0...120)(
      HashNode(9...27)(
        (9...10),
        [AssocNode(11...17)(
-          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "a"),
-          CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 0, "b"),
+          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
+          CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "b"),
           (13...15)
         ),
         AssocNode(19...25)(
-          CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 0, "c"),
-          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 0, "d"),
+          CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "c"),
+          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "d"),
           (21...23)
         )],
        (26...27)
@@ -20,12 +20,12 @@ ProgramNode(0...120)(
      HashNode(29...44)(
        (29...30),
        [AssocNode(31...37)(
-          CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 0, "a"),
-          CallNode(36...37)(nil, nil, (36...37), nil, nil, nil, nil, 0, "b"),
+          CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "a"),
+          CallNode(36...37)(nil, nil, (36...37), nil, nil, nil, nil, 2, "b"),
           (33...35)
         ),
         AssocSplatNode(39...42)(
-          CallNode(41...42)(nil, nil, (41...42), nil, nil, nil, nil, 0, "c"),
+          CallNode(41...42)(nil, nil, (41...42), nil, nil, nil, nil, 2, "c"),
           (39...41)
         )],
        (43...44)
@@ -34,12 +34,12 @@ ProgramNode(0...120)(
        (46...47),
        [AssocNode(54...58)(
           SymbolNode(54...56)(nil, (54...55), (55...56), "a"),
-          CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 0, "b"),
+          CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 2, "b"),
           nil
         ),
         AssocNode(66...70)(
           SymbolNode(66...68)(nil, (66...67), (67...68), "c"),
-          CallNode(69...70)(nil, nil, (69...70), nil, nil, nil, nil, 0, "d"),
+          CallNode(69...70)(nil, nil, (69...70), nil, nil, nil, nil, 2, "d"),
           nil
         )],
        (78...79)
@@ -48,16 +48,16 @@ ProgramNode(0...120)(
        (81...82),
        [AssocNode(83...87)(
           SymbolNode(83...85)(nil, (83...84), (84...85), "a"),
-          CallNode(86...87)(nil, nil, (86...87), nil, nil, nil, nil, 0, "b"),
+          CallNode(86...87)(nil, nil, (86...87), nil, nil, nil, nil, 2, "b"),
           nil
         ),
         AssocNode(89...93)(
           SymbolNode(89...91)(nil, (89...90), (90...91), "c"),
-          CallNode(92...93)(nil, nil, (92...93), nil, nil, nil, nil, 0, "d"),
+          CallNode(92...93)(nil, nil, (92...93), nil, nil, nil, nil, 2, "d"),
           nil
         ),
         AssocSplatNode(95...98)(
-          CallNode(97...98)(nil, nil, (97...98), nil, nil, nil, nil, 0, "e"),
+          CallNode(97...98)(nil, nil, (97...98), nil, nil, nil, nil, 2, "e"),
           (95...97)
         ),
         AssocNode(100...104)(
@@ -70,7 +70,7 @@ ProgramNode(0...120)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "g"
           ),
           nil
@@ -90,7 +90,7 @@ ProgramNode(0...120)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b?"
             ),
             nil,
diff --git a/test/snapshots/if.txt b/test/snapshots/if.txt
index 1dc934f73ad..c12691abfe5 100644
--- a/test/snapshots/if.txt
+++ b/test/snapshots/if.txt
@@ -80,7 +80,7 @@ ProgramNode(0...382)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "exit_loop"
        ),
        StatementsNode(188...196)(
@@ -102,7 +102,7 @@ ProgramNode(0...382)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StatementsNode(214...217)(
@@ -114,7 +114,7 @@ ProgramNode(0...382)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -123,7 +123,7 @@ ProgramNode(0...382)(
      ),
      IfNode(223...234)(
        (230...232),
-       CallNode(233...234)(nil, nil, (233...234), nil, nil, nil, nil, 0, "c"),
+       CallNode(233...234)(nil, nil, (233...234), nil, nil, nil, nil, 2, "c"),
        StatementsNode(223...229)(
          [IfNode(223...229)(
             (225...227),
@@ -135,7 +135,7 @@ ProgramNode(0...382)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             ),
             StatementsNode(223...224)(
@@ -147,7 +147,7 @@ ProgramNode(0...382)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "a"
                )]
             ),
@@ -196,7 +196,7 @@ ProgramNode(0...382)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "type"
          ),
          IntegerNode(272...273)(),
@@ -214,7 +214,7 @@ ProgramNode(0...382)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "type"
            ),
            ConstantReadNode(288...289)(),
diff --git a/test/snapshots/lambda.txt b/test/snapshots/lambda.txt
index 9d62e3d079f..bf59e6aa684 100644
--- a/test/snapshots/lambda.txt
+++ b/test/snapshots/lambda.txt
@@ -45,7 +45,7 @@ ProgramNode(0...51)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "a"
                       )]
                    ),
@@ -83,7 +83,7 @@ ProgramNode(0...51)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "b"
                 ),
                 nil,
diff --git a/test/snapshots/method_calls.txt b/test/snapshots/method_calls.txt
index 719f07e0eb4..60ceaae6524 100644
--- a/test/snapshots/method_calls.txt
+++ b/test/snapshots/method_calls.txt
@@ -2,7 +2,7 @@ ProgramNode(0...1187)(
   [],
   StatementsNode(0...1187)(
     [CallNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (4...7),
        nil,
@@ -15,13 +15,13 @@ ProgramNode(0...1187)(
        "bar"
      ),
      CallNode(16...25)(
-       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 0, "a"),
+       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
        (17...18),
        (18...19),
        (19...20),
        ArgumentsNode(20...24)(
-         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 0, "c"),
-          CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 0, "d")]
+         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "c"),
+          CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "d")]
        ),
        (24...25),
        nil,
@@ -29,7 +29,7 @@ ProgramNode(0...1187)(
        "b"
      ),
      CallNode(27...32)(
-       CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 0, "a"),
+       CallNode(27...28)(nil, nil, (27...28), nil, nil, nil, nil, 2, "a"),
        (28...29),
        (29...30),
        (30...31),
@@ -41,7 +41,7 @@ ProgramNode(0...1187)(
      ),
      CallNode(34...52)(
        CallNode(34...44)(
-         CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 0, "foo"),
+         CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 2, "foo"),
          (40...41),
          (41...44),
          nil,
@@ -60,9 +60,9 @@ ProgramNode(0...1187)(
        1,
        "baz"
      ),
-     CallNode(54...56)(nil, nil, (54...56), nil, nil, nil, nil, 0, "a!"),
+     CallNode(54...56)(nil, nil, (54...56), nil, nil, nil, nil, 2, "a!"),
      CallNode(58...62)(
-       CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 0, "a"),
+       CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 2, "a"),
        (59...60),
        (0...0),
        (60...61),
@@ -73,7 +73,7 @@ ProgramNode(0...1187)(
        "call"
      ),
      CallNode(64...75)(
-       CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 0, "a"),
+       CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "a"),
        (65...66),
        (0...0),
        (66...67),
@@ -88,7 +88,7 @@ ProgramNode(0...1187)(
        "call"
      ),
      CallNode(77...81)(
-       CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 0, "a"),
+       CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 2, "a"),
        (78...80),
        (80...81),
        nil,
@@ -99,7 +99,7 @@ ProgramNode(0...1187)(
        "b"
      ),
      CallNode(83...94)(
-       CallNode(83...86)(nil, nil, (83...86), nil, nil, nil, nil, 0, "foo"),
+       CallNode(83...86)(nil, nil, (83...86), nil, nil, nil, nil, 2, "foo"),
        (86...87),
        (87...90),
        nil,
@@ -109,7 +109,7 @@ ProgramNode(0...1187)(
        0,
        "bar="
      ),
-     CallNode(96...98)(nil, nil, (96...98), nil, nil, nil, nil, 0, "a?"),
+     CallNode(96...98)(nil, nil, (96...98), nil, nil, nil, nil, 2, "a?"),
      CallNode(100...109)(
        nil,
        nil,
@@ -125,7 +125,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (102...103)
@@ -152,7 +152,7 @@ ProgramNode(0...1187)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "kwargs"
                ),
                (113...115)
@@ -174,7 +174,7 @@ ProgramNode(0...1187)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "a"
          ),
          (125...126),
@@ -209,7 +209,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "b"
           ),
           CallNode(136...137)(
@@ -220,7 +220,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "c"
           )]
        ),
@@ -256,7 +256,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           )]
@@ -280,7 +280,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "b"
           ),
           CallNode(160...161)(
@@ -291,7 +291,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "c"
           )]
        ),
@@ -301,7 +301,7 @@ ProgramNode(0...1187)(
        "a"
      ),
      CallNode(163...171)(
-       CallNode(163...164)(nil, nil, (163...164), nil, nil, nil, nil, 0, "a"),
+       CallNode(163...164)(nil, nil, (163...164), nil, nil, nil, nil, 2, "a"),
        (164...165),
        (165...166),
        nil,
@@ -314,7 +314,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "c"
           ),
           CallNode(170...171)(
@@ -325,7 +325,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "d"
           )]
        ),
@@ -344,7 +344,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           (176...177),
@@ -365,7 +365,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           (185...186),
@@ -387,7 +387,7 @@ ProgramNode(0...1187)(
        nil
      ),
      CallNode(198...202)(
-       CallNode(198...199)(nil, nil, (198...199), nil, nil, nil, nil, 0, "a"),
+       CallNode(198...199)(nil, nil, (198...199), nil, nil, nil, nil, 2, "a"),
        (199...201),
        (201...202),
        nil,
@@ -398,7 +398,7 @@ ProgramNode(0...1187)(
        "b"
      ),
      CallNode(204...209)(
-       CallNode(204...205)(nil, nil, (204...205), nil, nil, nil, nil, 0, "a"),
+       CallNode(204...205)(nil, nil, (204...205), nil, nil, nil, nil, 2, "a"),
        (205...207),
        (0...0),
        (207...208),
@@ -409,7 +409,7 @@ ProgramNode(0...1187)(
        "call"
      ),
      CallNode(211...218)(
-       CallNode(211...212)(nil, nil, (211...212), nil, nil, nil, nil, 0, "a"),
+       CallNode(211...212)(nil, nil, (211...212), nil, nil, nil, nil, 2, "a"),
        (212...214),
        (214...215),
        (215...216),
@@ -422,7 +422,7 @@ ProgramNode(0...1187)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "c"
           )]
        ),
@@ -432,7 +432,7 @@ ProgramNode(0...1187)(
        "b"
      ),
      CallNode(220...226)(
-       CallNode(220...221)(nil, nil, (220...221), nil, nil, nil, nil, 0, "a"),
+       CallNode(220...221)(nil, nil, (220...221), nil, nil, nil, nil, 2, "a"),
        (221...223),
        (223...224),
        (224...225),
@@ -454,7 +454,7 @@ ProgramNode(0...1187)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar?"
            ),
            CallNode(250...253)(
@@ -465,7 +465,7 @@ ProgramNode(0...1187)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "baz"
            ),
            (247...249)
@@ -478,7 +478,7 @@ ProgramNode(0...1187)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "qux"
          ),
          (254...257)
@@ -532,7 +532,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "rest"
             )
           )]
@@ -879,7 +879,7 @@ ProgramNode(0...1187)(
        "Integer"
      ),
      CallNode(696...706)(
-       CallNode(696...697)(nil, nil, (696...697), nil, nil, nil, nil, 0, "x"),
+       CallNode(696...697)(nil, nil, (696...697), nil, nil, nil, nil, 2, "x"),
        (697...698),
        (698...702),
        nil,
@@ -898,7 +898,7 @@ ProgramNode(0...1187)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (711...712),
@@ -1111,7 +1111,7 @@ ProgramNode(0...1187)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "bar"
                     ),
                     (852...853),
@@ -1293,7 +1293,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "x"
             ),
             StatementsNode(1008...1034)(
@@ -1356,7 +1356,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "x"
             ),
             StatementsNode(1064...1090)(
@@ -1404,7 +1404,7 @@ ProgramNode(0...1187)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "x"
             ),
             StatementsNode(1112...1126)(
@@ -1542,7 +1542,7 @@ ProgramNode(0...1187)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "lst"
        ),
        nil,
diff --git a/test/snapshots/methods.txt b/test/snapshots/methods.txt
index 8d1eee8a2a3..a2cfa8e06d0 100644
--- a/test/snapshots/methods.txt
+++ b/test/snapshots/methods.txt
@@ -94,7 +94,7 @@ ProgramNode(0...1194)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "b"
          ),
          (101...102),
@@ -121,7 +121,7 @@ ProgramNode(0...1194)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "a"
          ),
          (116...117),
@@ -186,7 +186,7 @@ ProgramNode(0...1194)(
      ),
      DefNode(177...188)(
        (183...184),
-       CallNode(181...182)(nil, nil, (181...182), nil, nil, nil, nil, 0, "a"),
+       CallNode(181...182)(nil, nil, (181...182), nil, nil, nil, nil, 2, "a"),
        nil,
        nil,
        [],
@@ -847,7 +847,7 @@ ProgramNode(0...1194)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "b"
            ),
            (769...770),
@@ -935,7 +935,7 @@ ProgramNode(0...1194)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "b"
            ),
            (833...834),
@@ -1052,7 +1052,7 @@ ProgramNode(0...1194)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "bar"
                     ),
                     (957...959)
@@ -1066,7 +1066,7 @@ ProgramNode(0...1194)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "baz"
                     ),
                     (964...966)
@@ -1080,7 +1080,7 @@ ProgramNode(0...1194)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "qux"
                     ),
                     (971...973)
@@ -1339,7 +1339,7 @@ ProgramNode(0...1194)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "item"
             ),
             nil,
diff --git a/test/snapshots/modules.txt b/test/snapshots/modules.txt
index 432d4c99165..705563a9f04 100644
--- a/test/snapshots/modules.txt
+++ b/test/snapshots/modules.txt
@@ -30,7 +30,7 @@ ProgramNode(0...140)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bbb"
              )]
           ),
@@ -43,7 +43,7 @@ ProgramNode(0...140)(
        [],
        (40...46),
        ConstantPathNode(47...51)(
-         CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 0, "m"),
+         CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 2, "m"),
          ConstantReadNode(50...51)(),
          (48...50)
        ),
diff --git a/test/snapshots/non_alphanumeric_methods.txt b/test/snapshots/non_alphanumeric_methods.txt
index ac2beadd0d9..a8e9cd798fb 100644
--- a/test/snapshots/non_alphanumeric_methods.txt
+++ b/test/snapshots/non_alphanumeric_methods.txt
@@ -215,7 +215,7 @@ ProgramNode(0...434)(
      ),
      DefNode(195...206)(
        (201...202),
-       CallNode(199...200)(nil, nil, (199...200), nil, nil, nil, nil, 0, "a"),
+       CallNode(199...200)(nil, nil, (199...200), nil, nil, nil, nil, 2, "a"),
        nil,
        nil,
        [],
diff --git a/test/snapshots/not.txt b/test/snapshots/not.txt
index a4be66de262..d57f4ab1773 100644
--- a/test/snapshots/not.txt
+++ b/test/snapshots/not.txt
@@ -3,7 +3,7 @@ ProgramNode(0...156)(
   StatementsNode(0...156)(
     [AndNode(0...19)(
        CallNode(0...7)(
-         CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "foo"),
+         CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
          nil,
          (0...3),
          nil,
@@ -14,7 +14,7 @@ ProgramNode(0...156)(
          "!"
        ),
        CallNode(12...19)(
-         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "bar"),
+         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar"),
          nil,
          (12...15),
          nil,
@@ -28,8 +28,8 @@ ProgramNode(0...156)(
      ),
      CallNode(21...37)(
        AndNode(25...36)(
-         CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 0, "foo"),
-         CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 0, "bar"),
+         CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
+         CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "bar"),
          (29...32)
        ),
        nil,
@@ -42,7 +42,7 @@ ProgramNode(0...156)(
        "!"
      ),
      CallNode(39...46)(
-       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 0, "foo"),
+       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 2, "foo"),
        nil,
        (39...42),
        nil,
@@ -54,7 +54,7 @@ ProgramNode(0...156)(
      ),
      AndNode(48...69)(
        CallNode(48...55)(
-         CallNode(52...55)(nil, nil, (52...55), nil, nil, nil, nil, 0, "foo"),
+         CallNode(52...55)(nil, nil, (52...55), nil, nil, nil, nil, 2, "foo"),
          nil,
          (48...51),
          nil,
@@ -65,7 +65,7 @@ ProgramNode(0...156)(
          "!"
        ),
        CallNode(60...69)(
-         CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 0, "bar"),
+         CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 2, "bar"),
          nil,
          (60...63),
          nil,
@@ -79,7 +79,7 @@ ProgramNode(0...156)(
      ),
      AndNode(72...97)(
        CallNode(72...79)(
-         CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 0, "foo"),
+         CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 2, "foo"),
          nil,
          (72...75),
          nil,
@@ -90,7 +90,7 @@ ProgramNode(0...156)(
          "!"
        ),
        CallNode(88...97)(
-         CallNode(94...97)(nil, nil, (94...97), nil, nil, nil, nil, 0, "bar"),
+         CallNode(94...97)(nil, nil, (94...97), nil, nil, nil, nil, 2, "bar"),
          nil,
          (88...91),
          nil,
@@ -112,7 +112,7 @@ ProgramNode(0...156)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil,
@@ -133,7 +133,7 @@ ProgramNode(0...156)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "bar"
          ),
          nil,
@@ -156,7 +156,7 @@ ProgramNode(0...156)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -177,7 +177,7 @@ ProgramNode(0...156)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
diff --git a/test/snapshots/patterns.txt b/test/snapshots/patterns.txt
index c76776e6fbc..d578a43f066 100644
--- a/test/snapshots/patterns.txt
+++ b/test/snapshots/patterns.txt
@@ -2,47 +2,47 @@ ProgramNode(0...3743)(
   [:bar, :baz, :qux, :b, :a],
   StatementsNode(0...3743)(
     [MatchRequiredNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        LocalVariableWriteNode(7...10)(:bar, 0, nil, (7...10), nil),
        (4...6)
      ),
      MatchRequiredNode(11...19)(
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
        IntegerNode(18...19)(),
        (15...17)
      ),
      MatchRequiredNode(20...30)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "foo"),
+       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
        FloatNode(27...30)(),
        (24...26)
      ),
      MatchRequiredNode(31...40)(
-       CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 0, "foo"),
+       CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 2, "foo"),
        ImaginaryNode(38...40)(IntegerNode(38...39)()),
        (35...37)
      ),
      MatchRequiredNode(41...50)(
-       CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 0, "foo"),
+       CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 2, "foo"),
        RationalNode(48...50)(IntegerNode(48...49)()),
        (45...47)
      ),
      MatchRequiredNode(51...62)(
-       CallNode(51...54)(nil, nil, (51...54), nil, nil, nil, nil, 0, "foo"),
+       CallNode(51...54)(nil, nil, (51...54), nil, nil, nil, nil, 2, "foo"),
        SymbolNode(58...62)((58...59), (59...62), nil, "foo"),
        (55...57)
      ),
      MatchRequiredNode(63...77)(
-       CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 0, "foo"),
+       CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 2, "foo"),
        SymbolNode(70...77)((70...73), (73...76), (76...77), "foo"),
        (67...69)
      ),
      MatchRequiredNode(78...91)(
-       CallNode(78...81)(nil, nil, (78...81), nil, nil, nil, nil, 0, "foo"),
+       CallNode(78...81)(nil, nil, (78...81), nil, nil, nil, nil, 2, "foo"),
        SymbolNode(85...91)(nil, (87...90), nil, "foo"),
        (82...84)
      ),
      MatchRequiredNode(92...104)(
-       CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 0, "foo"),
+       CallNode(92...95)(nil, nil, (92...95), nil, nil, nil, nil, 2, "foo"),
        RegularExpressionNode(99...104)(
          (99...100),
          (100...103),
@@ -61,7 +61,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        XStringNode(112...117)((112...113), (113...116), (116...117), "foo"),
@@ -76,7 +76,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        XStringNode(125...132)((125...128), (128...131), (131...132), "foo"),
@@ -91,7 +91,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(140...147)(
@@ -110,7 +110,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(155...162)(
@@ -129,7 +129,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(170...177)(
@@ -148,7 +148,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(185...192)(
@@ -167,7 +167,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(200...207)((200...203), (203...206), (206...207), "foo"),
@@ -182,7 +182,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(215...222)((215...218), (218...221), (221...222), "foo"),
@@ -197,7 +197,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(230...235)((230...231), (231...234), (234...235), "foo"),
@@ -212,7 +212,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        NilNode(243...246)(),
@@ -227,7 +227,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SelfNode(254...258)(),
@@ -242,7 +242,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        TrueNode(266...270)(),
@@ -257,7 +257,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FalseNode(278...283)(),
@@ -272,7 +272,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceFileNode(291...299)("patterns.txt"),
@@ -287,7 +287,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceLineNode(307...315)(),
@@ -302,7 +302,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceEncodingNode(323...335)(),
@@ -317,7 +317,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        LambdaNode(343...353)(
@@ -337,7 +337,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(362...368)(
@@ -357,7 +357,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(376...386)(
@@ -377,7 +377,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(394...402)(
@@ -397,7 +397,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(410...418)(
@@ -417,7 +417,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(426...438)(
@@ -437,7 +437,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(446...464)(
@@ -457,7 +457,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(472...488)(
@@ -477,7 +477,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(496...510)(
@@ -509,7 +509,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(518...532)(
@@ -529,7 +529,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(540...558)(
@@ -549,7 +549,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(566...584)(
@@ -577,7 +577,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(592...610)(
@@ -605,7 +605,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(618...636)(
@@ -633,7 +633,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(644...662)(
@@ -661,7 +661,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(670...688)(
@@ -681,7 +681,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(696...714)(
@@ -701,7 +701,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(722...736)(
@@ -721,7 +721,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(744...754)(
@@ -741,7 +741,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(762...774)(
@@ -761,7 +761,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(782...794)(
@@ -781,7 +781,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(802...816)(
@@ -801,7 +801,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(824...844)(
@@ -821,7 +821,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(852...872)(
@@ -841,7 +841,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(880...908)(
@@ -861,7 +861,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RangeNode(916...940)(
@@ -895,7 +895,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedVariableNode(949...953)(
@@ -913,7 +913,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedVariableNode(961...966)(
@@ -931,7 +931,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedVariableNode(974...980)(
@@ -949,7 +949,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedVariableNode(988...993)(
@@ -967,7 +967,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedExpressionNode(1002...1006)(
@@ -987,7 +987,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedExpressionNode(1014...1020)(
@@ -1007,7 +1007,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        PinnedExpressionNode(1028...1044)(
@@ -1049,7 +1049,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ConstantReadNode(1053...1056)(),
@@ -1064,7 +1064,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ConstantPathNode(1064...1077)(
@@ -1087,7 +1087,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ConstantPathNode(1085...1090)(
@@ -1106,7 +1106,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ConstantPathNode(1098...1113)(
@@ -1133,7 +1133,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1122...1127)(
@@ -1155,7 +1155,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1135...1141)(
@@ -1177,7 +1177,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1149...1161)(
@@ -1201,7 +1201,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1169...1177)(
@@ -1229,7 +1229,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1185...1199)(
@@ -1266,7 +1266,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1207...1221)(
@@ -1303,7 +1303,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FindPatternNode(1229...1249)(
@@ -1349,7 +1349,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1258...1263)(
@@ -1371,7 +1371,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1271...1277)(
@@ -1393,7 +1393,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1285...1297)(
@@ -1417,7 +1417,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1305...1315)(
@@ -1446,7 +1446,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1323...1331)(
@@ -1474,7 +1474,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1339...1353)(
@@ -1511,7 +1511,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1361...1375)(
@@ -1548,7 +1548,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FindPatternNode(1383...1403)(
@@ -1594,7 +1594,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1412...1416)(
@@ -1625,7 +1625,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1424...1438)(
@@ -1669,7 +1669,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1446...1460)(
@@ -1712,7 +1712,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1468...1482)(
@@ -1756,7 +1756,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FindPatternNode(1490...1505)(
@@ -1802,7 +1802,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1514...1516)(
@@ -1824,7 +1824,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1524...1534)(
@@ -1874,7 +1874,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1543...1549)(
@@ -1905,7 +1905,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1557...1573)(
@@ -1949,7 +1949,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1581...1597)(
@@ -1992,7 +1992,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayPatternNode(1605...1621)(
@@ -2036,7 +2036,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FindPatternNode(1629...1646)(
@@ -2082,7 +2082,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        LocalVariableWriteNode(1655...1658)(:bar, 0, nil, (1655...1658), nil),
@@ -2097,7 +2097,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        IntegerNode(1666...1667)(),
@@ -2112,7 +2112,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FloatNode(1675...1678)(),
@@ -2127,7 +2127,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ImaginaryNode(1686...1688)(IntegerNode(1686...1687)()),
@@ -2142,7 +2142,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RationalNode(1696...1698)(IntegerNode(1696...1697)()),
@@ -2157,7 +2157,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SymbolNode(1706...1710)((1706...1707), (1707...1710), nil, "foo"),
@@ -2172,7 +2172,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SymbolNode(1718...1725)(
@@ -2192,7 +2192,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SymbolNode(1733...1739)(nil, (1735...1738), nil, "foo"),
@@ -2207,7 +2207,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        RegularExpressionNode(1747...1752)(
@@ -2228,7 +2228,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        XStringNode(1760...1765)(
@@ -2248,7 +2248,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        XStringNode(1773...1780)(
@@ -2268,7 +2268,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(1788...1795)(
@@ -2287,7 +2287,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(1803...1810)(
@@ -2306,7 +2306,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(1818...1825)(
@@ -2325,7 +2325,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        ArrayNode(1833...1840)(
@@ -2344,7 +2344,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(1848...1855)(
@@ -2364,7 +2364,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(1863...1870)(
@@ -2384,7 +2384,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StringNode(1878...1883)(
@@ -2404,7 +2404,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        NilNode(1891...1894)(),
@@ -2419,7 +2419,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SelfNode(1902...1906)(),
@@ -2434,7 +2434,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        TrueNode(1914...1918)(),
@@ -2449,7 +2449,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        FalseNode(1926...1931)(),
@@ -2464,7 +2464,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceFileNode(1939...1947)("patterns.txt"),
@@ -2479,7 +2479,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceLineNode(1955...1963)(),
@@ -2494,7 +2494,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        SourceEncodingNode(1971...1983)(),
@@ -2509,7 +2509,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        LambdaNode(1991...2001)(
@@ -2531,7 +2531,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2013...2024)(
@@ -2559,7 +2559,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2039...2048)(
@@ -2581,7 +2581,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2063...2074)(
@@ -2603,7 +2603,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2089...2099)(
@@ -2625,7 +2625,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2114...2124)(
@@ -2647,7 +2647,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2139...2151)(
@@ -2669,7 +2669,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2166...2181)(
@@ -2696,7 +2696,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2196...2210)(
@@ -2718,7 +2718,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2225...2238)(
@@ -2746,7 +2746,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2253...2266)(
@@ -2773,7 +2773,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2281...2296)(
@@ -2800,7 +2800,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2311...2326)(
@@ -2826,7 +2826,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2341...2356)(
@@ -2852,7 +2852,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2371...2386)(
@@ -2878,7 +2878,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2401...2416)(
@@ -2904,7 +2904,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2431...2446)(
@@ -2931,7 +2931,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2461...2476)(
@@ -2958,7 +2958,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2491...2504)(
@@ -2985,7 +2985,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2519...2530)(
@@ -3007,7 +3007,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2545...2557)(
@@ -3029,7 +3029,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2572...2584)(
@@ -3051,7 +3051,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2599...2612)(
@@ -3073,7 +3073,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2627...2643)(
@@ -3095,7 +3095,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2658...2674)(
@@ -3117,7 +3117,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2689...2709)(
@@ -3139,7 +3139,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2724...2742)(
@@ -3168,7 +3168,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2758...2776)(
@@ -3204,7 +3204,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2791...2807)(
@@ -3232,7 +3232,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2822...2840)(
@@ -3260,7 +3260,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2855...2872)(
@@ -3290,7 +3290,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2887...2904)(
@@ -3320,7 +3320,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2919...2938)(
@@ -3355,7 +3355,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2953...2975)(
@@ -3390,7 +3390,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(2990...3011)(
@@ -3420,7 +3420,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3026...3046)(
@@ -3456,7 +3456,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3061...3081)(
@@ -3491,7 +3491,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3096...3118)(
@@ -3526,7 +3526,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3133...3155)(
@@ -3560,7 +3560,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3170...3192)(
@@ -3594,7 +3594,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3207...3229)(
@@ -3628,7 +3628,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3244...3266)(
@@ -3662,7 +3662,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3281...3303)(
@@ -3697,7 +3697,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3318...3340)(
@@ -3732,7 +3732,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3355...3375)(
@@ -3767,7 +3767,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3390...3408)(
@@ -3795,7 +3795,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3423...3442)(
@@ -3823,7 +3823,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3457...3476)(
@@ -3851,7 +3851,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3491...3511)(
@@ -3879,7 +3879,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3526...3549)(
@@ -3909,7 +3909,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3564...3587)(
@@ -3937,7 +3937,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3602...3629)(
@@ -3965,7 +3965,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(3644...3669)(
@@ -4004,7 +4004,7 @@ ProgramNode(0...3743)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "a"
          ),
          ArrayPatternNode(3683...3685)(
@@ -4030,7 +4030,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "a"
        ),
        ArrayPatternNode(3696...3703)(
@@ -4052,7 +4052,7 @@ ProgramNode(0...3743)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        HashPatternNode(3712...3743)(
diff --git a/test/snapshots/procs.txt b/test/snapshots/procs.txt
index 0e02784453a..3db8ec5b137 100644
--- a/test/snapshots/procs.txt
+++ b/test/snapshots/procs.txt
@@ -51,7 +51,7 @@ ProgramNode(0...266)(
        (71...73),
        nil,
        StatementsNode(76...79)(
-         [CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(76...79)(nil, nil, (76...79), nil, nil, nil, nil, 2, "foo")]
        )
      ),
      LambdaNode(83...98)(
@@ -59,7 +59,7 @@ ProgramNode(0...266)(
        (83...85),
        nil,
        StatementsNode(90...93)(
-         [CallNode(90...93)(nil, nil, (90...93), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(90...93)(nil, nil, (90...93), nil, nil, nil, nil, 2, "foo")]
        )
      ),
      LambdaNode(100...129)(
diff --git a/test/snapshots/ranges.txt b/test/snapshots/ranges.txt
index d78044bab0b..8873f61b0a9 100644
--- a/test/snapshots/ranges.txt
+++ b/test/snapshots/ranges.txt
@@ -22,7 +22,7 @@ ProgramNode(0...85)(
        1
      ),
      CallNode(22...31)(
-       CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 0, "foo"),
+       CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "foo"),
        nil,
        (25...31),
        (25...26),
@@ -48,7 +48,7 @@ ProgramNode(0...85)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             (40...43),
@@ -85,7 +85,7 @@ ProgramNode(0...85)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             (71...73),
diff --git a/test/snapshots/regex.txt b/test/snapshots/regex.txt
index b53f35df2a5..67d7ab0480c 100644
--- a/test/snapshots/regex.txt
+++ b/test/snapshots/regex.txt
@@ -40,7 +40,7 @@ ProgramNode(0...278)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bbb"
              )]
           ),
@@ -71,7 +71,7 @@ ProgramNode(0...278)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )]
           ),
diff --git a/test/snapshots/rescue.txt b/test/snapshots/rescue.txt
index 01887935e8b..b8944afd19b 100644
--- a/test/snapshots/rescue.txt
+++ b/test/snapshots/rescue.txt
@@ -2,12 +2,12 @@ ProgramNode(0...316)(
   [:a],
   StatementsNode(0...316)(
     [RescueModifierNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (4...10),
        NilNode(11...14)()
      ),
      RescueModifierNode(16...30)(
-       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "foo"),
+       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
        (20...26),
        NilNode(27...30)()
      ),
@@ -27,7 +27,7 @@ ProgramNode(0...316)(
        NilNode(81...84)()
      ),
      RescueModifierNode(86...105)(
-       CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 0, "foo"),
+       CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 2, "foo"),
        (90...96),
        OrNode(97...105)(
          NilNode(97...100)(),
@@ -44,7 +44,7 @@ ProgramNode(0...316)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (111...117),
@@ -71,7 +71,7 @@ ProgramNode(0...316)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -87,7 +87,7 @@ ProgramNode(0...316)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )
           )],
@@ -139,7 +139,7 @@ ProgramNode(0...316)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "y"
                    )]
                 ),
@@ -201,7 +201,7 @@ ProgramNode(0...316)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "foo"
            ),
            (225...231),
@@ -219,7 +219,7 @@ ProgramNode(0...316)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
diff --git a/test/snapshots/seattlerb/attrasgn_array_arg.txt b/test/snapshots/seattlerb/attrasgn_array_arg.txt
index 4da302b1411..b9a116975a9 100644
--- a/test/snapshots/seattlerb/attrasgn_array_arg.txt
+++ b/test/snapshots/seattlerb/attrasgn_array_arg.txt
@@ -2,7 +2,7 @@ ProgramNode(0...13)(
   [],
   StatementsNode(0...13)(
     [CallNode(0...13)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        nil,
        (1...9),
        (1...2),
diff --git a/test/snapshots/seattlerb/attrasgn_array_lhs.txt b/test/snapshots/seattlerb/attrasgn_array_lhs.txt
index e720ae5c863..666f9e34765 100644
--- a/test/snapshots/seattlerb/attrasgn_array_lhs.txt
+++ b/test/snapshots/seattlerb/attrasgn_array_lhs.txt
@@ -23,7 +23,7 @@ ProgramNode(0...42)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "from"
             ),
             CallNode(21...23)(
@@ -34,7 +34,7 @@ ProgramNode(0...42)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "to"
             ),
             (18...20),
diff --git a/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt b/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
index 562fa404d41..f9d549a27be 100644
--- a/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
+++ b/test/snapshots/seattlerb/attrasgn_primary_dot_constant.txt
@@ -2,7 +2,7 @@ ProgramNode(0...7)(
   [],
   StatementsNode(0...7)(
     [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        nil,
diff --git a/test/snapshots/seattlerb/backticks_interpolation_line.txt b/test/snapshots/seattlerb/backticks_interpolation_line.txt
index 27d3f4e3cf8..86c78947fa9 100644
--- a/test/snapshots/seattlerb/backticks_interpolation_line.txt
+++ b/test/snapshots/seattlerb/backticks_interpolation_line.txt
@@ -20,7 +20,7 @@ ProgramNode(0...8)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "y"
                   )]
                ),
diff --git a/test/snapshots/seattlerb/bdot2.txt b/test/snapshots/seattlerb/bdot2.txt
index 107f9ec2068..ff960bce8eb 100644
--- a/test/snapshots/seattlerb/bdot2.txt
+++ b/test/snapshots/seattlerb/bdot2.txt
@@ -4,10 +4,10 @@ ProgramNode(0...14)(
     [RangeNode(0...4)(nil, IntegerNode(2...4)(), (0...2), 0),
      RangeNode(7...10)(
        nil,
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "a"),
+       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "a"),
        (7...9),
        0
      ),
-     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "c")]
+     CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/bdot3.txt b/test/snapshots/seattlerb/bdot3.txt
index 433ff9b38f8..abc8a679f1c 100644
--- a/test/snapshots/seattlerb/bdot3.txt
+++ b/test/snapshots/seattlerb/bdot3.txt
@@ -4,10 +4,10 @@ ProgramNode(0...16)(
     [RangeNode(0...5)(nil, IntegerNode(3...5)(), (0...3), 1),
      RangeNode(8...12)(
        nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "a"),
+       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
        (8...11),
        1
      ),
-     CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 0, "c")]
+     CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/block_break.txt b/test/snapshots/seattlerb/block_break.txt
index 3d93c86f692..9ebe2b1488f 100644
--- a/test/snapshots/seattlerb/block_break.txt
+++ b/test/snapshots/seattlerb/block_break.txt
@@ -17,7 +17,7 @@ ProgramNode(0...26)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "arg"
                )]
             ),
diff --git a/test/snapshots/seattlerb/block_call_defn_call_block_call.txt b/test/snapshots/seattlerb/block_call_defn_call_block_call.txt
index 5c68b724785..46b55171fab 100644
--- a/test/snapshots/seattlerb/block_call_defn_call_block_call.txt
+++ b/test/snapshots/seattlerb/block_call_defn_call_block_call.txt
@@ -28,7 +28,7 @@ ProgramNode(0...30)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "d"
                )]
             ),
@@ -47,7 +47,7 @@ ProgramNode(0...30)(
        "a"
      ),
      CallNode(20...30)(
-       CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 0, "e"),
+       CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "e"),
        (21...22),
        (22...23),
        nil,
diff --git a/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt b/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
index 5b3de7d3529..60c529a4253 100644
--- a/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
+++ b/test/snapshots/seattlerb/block_call_dot_op2_brace_block.txt
@@ -3,7 +3,7 @@ ProgramNode(0...31)(
   StatementsNode(0...31)(
     [CallNode(0...31)(
        CallNode(0...16)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (2...3),
          nil,
@@ -33,7 +33,7 @@ ProgramNode(0...31)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "d"
               )]
            ),
@@ -65,7 +65,7 @@ ProgramNode(0...31)(
            (24...25)
          ),
          StatementsNode(26...27)(
-           [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 0, "g")]
+           [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 2, "g")]
          ),
          (19...21),
          (28...31)
diff --git a/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt b/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
index 28d30af0c60..c41a55f13fe 100644
--- a/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
+++ b/test/snapshots/seattlerb/block_call_dot_op2_cmd_args_do_block.txt
@@ -3,7 +3,7 @@ ProgramNode(0...33)(
   StatementsNode(0...33)(
     [CallNode(0...33)(
        CallNode(0...16)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (2...3),
          nil,
@@ -33,7 +33,7 @@ ProgramNode(0...33)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "d"
               )]
            ),
@@ -47,7 +47,7 @@ ProgramNode(0...33)(
        (17...18),
        nil,
        ArgumentsNode(19...20)(
-         [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 0, "f")]
+         [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "f")]
        ),
        nil,
        BlockNode(21...33)(
@@ -67,7 +67,7 @@ ProgramNode(0...33)(
            (26...27)
          ),
          StatementsNode(28...29)(
-           [CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 0, "h")]
+           [CallNode(28...29)(nil, nil, (28...29), nil, nil, nil, nil, 2, "h")]
          ),
          (21...23),
          (30...33)
diff --git a/test/snapshots/seattlerb/block_call_operation_colon.txt b/test/snapshots/seattlerb/block_call_operation_colon.txt
index 9f2be35702d..348e82f706c 100644
--- a/test/snapshots/seattlerb/block_call_operation_colon.txt
+++ b/test/snapshots/seattlerb/block_call_operation_colon.txt
@@ -3,12 +3,12 @@ ProgramNode(0...15)(
   StatementsNode(0...15)(
     [CallNode(0...15)(
        CallNode(0...12)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (2...3),
          nil,
          ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "c")]
+           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c")]
          ),
          nil,
          BlockNode(6...12)([], nil, nil, (6...8), (9...12)),
diff --git a/test/snapshots/seattlerb/block_call_operation_dot.txt b/test/snapshots/seattlerb/block_call_operation_dot.txt
index 255fdc22714..05edca98a44 100644
--- a/test/snapshots/seattlerb/block_call_operation_dot.txt
+++ b/test/snapshots/seattlerb/block_call_operation_dot.txt
@@ -3,12 +3,12 @@ ProgramNode(0...14)(
   StatementsNode(0...14)(
     [CallNode(0...14)(
        CallNode(0...12)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (2...3),
          nil,
          ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "c")]
+           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c")]
          ),
          nil,
          BlockNode(6...12)([], nil, nil, (6...8), (9...12)),
diff --git a/test/snapshots/seattlerb/block_call_paren_call_block_call.txt b/test/snapshots/seattlerb/block_call_paren_call_block_call.txt
index 0689466b69b..4b7916f0e6b 100644
--- a/test/snapshots/seattlerb/block_call_paren_call_block_call.txt
+++ b/test/snapshots/seattlerb/block_call_paren_call_block_call.txt
@@ -9,7 +9,7 @@ ProgramNode(0...16)(
        ArgumentsNode(2...5)(
          [ParenthesesNode(2...5)(
             StatementsNode(3...4)(
-              [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "b")]
+              [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b")]
             ),
             (2...3),
             (4...5)
@@ -21,7 +21,7 @@ ProgramNode(0...16)(
        "a"
      ),
      CallNode(6...16)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "c"),
+       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "c"),
        (7...8),
        (8...9),
        nil,
diff --git a/test/snapshots/seattlerb/block_next.txt b/test/snapshots/seattlerb/block_next.txt
index b7babbf781e..021f2ed15c5 100644
--- a/test/snapshots/seattlerb/block_next.txt
+++ b/test/snapshots/seattlerb/block_next.txt
@@ -17,7 +17,7 @@ ProgramNode(0...25)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "arg"
                )]
             ),
diff --git a/test/snapshots/seattlerb/block_return.txt b/test/snapshots/seattlerb/block_return.txt
index b8adacc523c..97fab8c5143 100644
--- a/test/snapshots/seattlerb/block_return.txt
+++ b/test/snapshots/seattlerb/block_return.txt
@@ -18,7 +18,7 @@ ProgramNode(0...27)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "arg"
                )]
             ),
diff --git a/test/snapshots/seattlerb/bug191.txt b/test/snapshots/seattlerb/bug191.txt
index 0e45d22daea..46d5ed6d740 100644
--- a/test/snapshots/seattlerb/bug191.txt
+++ b/test/snapshots/seattlerb/bug191.txt
@@ -3,14 +3,14 @@ ProgramNode(0...20)(
   StatementsNode(0...20)(
     [IfNode(0...9)(
        nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        StatementsNode(4...6)(
          [StringNode(4...6)((4...5), (5...5), (5...6), "")]
        ),
        ElseNode(6...9)(
          (6...7),
          StatementsNode(8...9)(
-           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "b")]
+           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
@@ -18,14 +18,14 @@ ProgramNode(0...20)(
      ),
      IfNode(11...20)(
        nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "a"),
+       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
        StatementsNode(15...17)(
          [StringNode(15...17)((15...16), (16...16), (16...17), "")]
        ),
        ElseNode(17...20)(
          (17...18),
          StatementsNode(19...20)(
-           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 0, "b")]
+           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
diff --git a/test/snapshots/seattlerb/bug290.txt b/test/snapshots/seattlerb/bug290.txt
index 84e7cbeb976..30d5780f505 100644
--- a/test/snapshots/seattlerb/bug290.txt
+++ b/test/snapshots/seattlerb/bug290.txt
@@ -4,7 +4,7 @@ ProgramNode(0...15)(
     [BeginNode(0...15)(
        (0...5),
        StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "foo")]
        ),
        nil,
        nil,
diff --git a/test/snapshots/seattlerb/bug_187.txt b/test/snapshots/seattlerb/bug_187.txt
index b0c76b3c4b3..f4ca89ff6d9 100644
--- a/test/snapshots/seattlerb/bug_187.txt
+++ b/test/snapshots/seattlerb/bug_187.txt
@@ -21,7 +21,7 @@ ProgramNode(0...28)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "a"
                  ),
                  (15...16),
diff --git a/test/snapshots/seattlerb/bug_args__19.txt b/test/snapshots/seattlerb/bug_args__19.txt
index 64dece1b91d..eba3f72951a 100644
--- a/test/snapshots/seattlerb/bug_args__19.txt
+++ b/test/snapshots/seattlerb/bug_args__19.txt
@@ -30,7 +30,7 @@ ProgramNode(0...16)(
            (11...12)
          ),
          StatementsNode(13...14)(
-           [CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "d")]
+           [CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "d")]
          ),
          (2...3),
          (15...16)
diff --git a/test/snapshots/seattlerb/bug_comma.txt b/test/snapshots/seattlerb/bug_comma.txt
index b4dbc7db5a0..a6dd7516aeb 100644
--- a/test/snapshots/seattlerb/bug_comma.txt
+++ b/test/snapshots/seattlerb/bug_comma.txt
@@ -18,7 +18,7 @@ ProgramNode(0...24)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "dir"
             )]
          ),
diff --git a/test/snapshots/seattlerb/bug_not_parens.txt b/test/snapshots/seattlerb/bug_not_parens.txt
index 3a12af1da87..e4a01de3f48 100644
--- a/test/snapshots/seattlerb/bug_not_parens.txt
+++ b/test/snapshots/seattlerb/bug_not_parens.txt
@@ -2,7 +2,7 @@ ProgramNode(0...6)(
   [],
   StatementsNode(0...6)(
     [CallNode(0...6)(
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "a"),
+       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
        nil,
        (0...3),
        (3...4),
diff --git a/test/snapshots/seattlerb/bug_op_asgn_rescue.txt b/test/snapshots/seattlerb/bug_op_asgn_rescue.txt
index 2a445ebfdb1..e54cde69f57 100644
--- a/test/snapshots/seattlerb/bug_op_asgn_rescue.txt
+++ b/test/snapshots/seattlerb/bug_op_asgn_rescue.txt
@@ -5,7 +5,7 @@ ProgramNode(0...18)(
        (0...1),
        (2...5),
        RescueModifierNode(6...18)(
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b"),
+         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
          (8...14),
          NilNode(15...18)()
        ),
diff --git a/test/snapshots/seattlerb/call_arg_kwsplat.txt b/test/snapshots/seattlerb/call_arg_kwsplat.txt
index 9571678cf7b..6a98d992d3c 100644
--- a/test/snapshots/seattlerb/call_arg_kwsplat.txt
+++ b/test/snapshots/seattlerb/call_arg_kwsplat.txt
@@ -7,7 +7,7 @@ ProgramNode(0...9)(
        (0...1),
        (1...2),
        ArgumentsNode(2...8)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "b"),
+         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
           KeywordHashNode(5...8)(
             [AssocSplatNode(5...8)(IntegerNode(7...8)(), (5...7))]
           )]
diff --git a/test/snapshots/seattlerb/call_args_assoc_quoted.txt b/test/snapshots/seattlerb/call_args_assoc_quoted.txt
index 792b07c41db..b632adc6ba5 100644
--- a/test/snapshots/seattlerb/call_args_assoc_quoted.txt
+++ b/test/snapshots/seattlerb/call_args_assoc_quoted.txt
@@ -22,7 +22,7 @@ ProgramNode(0...31)(
                          nil,
                          nil,
                          nil,
-                         0,
+                         2,
                          "k"
                        )]
                     ),
diff --git a/test/snapshots/seattlerb/call_args_command.txt b/test/snapshots/seattlerb/call_args_command.txt
index 649e360f18e..fa5c35b8680 100644
--- a/test/snapshots/seattlerb/call_args_command.txt
+++ b/test/snapshots/seattlerb/call_args_command.txt
@@ -2,13 +2,13 @@ ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
     [CallNode(0...9)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        nil,
        ArgumentsNode(4...9)(
          [CallNode(4...9)(
-            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "c"),
+            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "c"),
             (5...6),
             (6...7),
             nil,
diff --git a/test/snapshots/seattlerb/call_bang_command_call.txt b/test/snapshots/seattlerb/call_bang_command_call.txt
index 37cf8e13af3..104d90d1c2a 100644
--- a/test/snapshots/seattlerb/call_bang_command_call.txt
+++ b/test/snapshots/seattlerb/call_bang_command_call.txt
@@ -3,7 +3,7 @@ ProgramNode(0...7)(
   StatementsNode(0...7)(
     [CallNode(0...7)(
        CallNode(2...7)(
-         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a"),
+         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
          (3...4),
          (4...5),
          nil,
diff --git a/test/snapshots/seattlerb/call_begin_call_block_call.txt b/test/snapshots/seattlerb/call_begin_call_block_call.txt
index 7d0e92cf1d9..9b60d515f0c 100644
--- a/test/snapshots/seattlerb/call_begin_call_block_call.txt
+++ b/test/snapshots/seattlerb/call_begin_call_block_call.txt
@@ -19,7 +19,7 @@ ProgramNode(0...22)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "b"
                  ),
                  (9...10),
diff --git a/test/snapshots/seattlerb/call_block_arg_named.txt b/test/snapshots/seattlerb/call_block_arg_named.txt
index e0d6cc8e03f..f24da1bcd50 100644
--- a/test/snapshots/seattlerb/call_block_arg_named.txt
+++ b/test/snapshots/seattlerb/call_block_arg_named.txt
@@ -8,7 +8,7 @@ ProgramNode(0...7)(
        (1...2),
        ArgumentsNode(2...6)(
          [BlockArgumentNode(2...6)(
-            CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "blk"),
+            CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "blk"),
             (2...3)
           )]
        ),
diff --git a/test/snapshots/seattlerb/call_env.txt b/test/snapshots/seattlerb/call_env.txt
index 9f2860ab563..8af975cdce7 100644
--- a/test/snapshots/seattlerb/call_env.txt
+++ b/test/snapshots/seattlerb/call_env.txt
@@ -2,7 +2,7 @@ ProgramNode(0...7)(
   [],
   StatementsNode(0...7)(
     [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...7),
        nil,
diff --git a/test/snapshots/seattlerb/call_leading_dots.txt b/test/snapshots/seattlerb/call_leading_dots.txt
index 47f2c8e5c54..bc418635a10 100644
--- a/test/snapshots/seattlerb/call_leading_dots.txt
+++ b/test/snapshots/seattlerb/call_leading_dots.txt
@@ -3,7 +3,7 @@ ProgramNode(0...7)(
   StatementsNode(0...7)(
     [CallNode(0...7)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (2...3),
          (3...4),
          nil,
diff --git a/test/snapshots/seattlerb/call_leading_dots_comment.txt b/test/snapshots/seattlerb/call_leading_dots_comment.txt
index 0f64dd7e26b..e9a88d05d4b 100644
--- a/test/snapshots/seattlerb/call_leading_dots_comment.txt
+++ b/test/snapshots/seattlerb/call_leading_dots_comment.txt
@@ -3,7 +3,7 @@ ProgramNode(0...11)(
   StatementsNode(0...11)(
     [CallNode(0...11)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (2...3),
          (3...4),
          nil,
diff --git a/test/snapshots/seattlerb/call_trailing_dots.txt b/test/snapshots/seattlerb/call_trailing_dots.txt
index 929decb5f14..a2ccf8addde 100644
--- a/test/snapshots/seattlerb/call_trailing_dots.txt
+++ b/test/snapshots/seattlerb/call_trailing_dots.txt
@@ -3,7 +3,7 @@ ProgramNode(0...7)(
   StatementsNode(0...7)(
     [CallNode(0...7)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (3...4),
          nil,
diff --git a/test/snapshots/seattlerb/case_in.txt b/test/snapshots/seattlerb/case_in.txt
index 981905526ce..e339f35c8c8 100644
--- a/test/snapshots/seattlerb/case_in.txt
+++ b/test/snapshots/seattlerb/case_in.txt
@@ -478,7 +478,7 @@ ProgramNode(0...746)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "a"
                ),
                (604...605),
diff --git a/test/snapshots/seattlerb/defn_oneliner_noargs.txt b/test/snapshots/seattlerb/defn_oneliner_noargs.txt
index b560a37f612..683c405b185 100644
--- a/test/snapshots/seattlerb/defn_oneliner_noargs.txt
+++ b/test/snapshots/seattlerb/defn_oneliner_noargs.txt
@@ -14,7 +14,7 @@ ProgramNode(0...17)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "system"
           )]
        ),
diff --git a/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt b/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
index 7a106c57d68..bbf7fd2dcae 100644
--- a/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
+++ b/test/snapshots/seattlerb/defn_oneliner_noargs_parentheses.txt
@@ -14,7 +14,7 @@ ProgramNode(0...19)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "system"
           )]
        ),
diff --git a/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt b/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
index 57e5932ab46..d223e069137 100644
--- a/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
+++ b/test/snapshots/seattlerb/defs_as_arg_with_do_block_inside.txt
@@ -21,7 +21,7 @@ ProgramNode(0...30)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "x"
                  ),
                  (15...16),
diff --git a/test/snapshots/seattlerb/defs_endless_command.txt b/test/snapshots/seattlerb/defs_endless_command.txt
index 11572715afa..3675f26ddff 100644
--- a/test/snapshots/seattlerb/defs_endless_command.txt
+++ b/test/snapshots/seattlerb/defs_endless_command.txt
@@ -3,7 +3,7 @@ ProgramNode(0...35)(
   StatementsNode(0...35)(
     [DefNode(0...35)(
        (6...17),
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "x"),
+       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"),
        nil,
        StatementsNode(20...35)(
          [CallNode(20...35)(
diff --git a/test/snapshots/seattlerb/defs_endless_command_rescue.txt b/test/snapshots/seattlerb/defs_endless_command_rescue.txt
index b657a3f19d0..e032fff9a6b 100644
--- a/test/snapshots/seattlerb/defs_endless_command_rescue.txt
+++ b/test/snapshots/seattlerb/defs_endless_command_rescue.txt
@@ -3,7 +3,7 @@ ProgramNode(0...45)(
   StatementsNode(0...45)(
     [DefNode(0...45)(
        (6...17),
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "x"),
+       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "x"),
        nil,
        StatementsNode(20...45)(
          [CallNode(20...45)(
diff --git a/test/snapshots/seattlerb/do_bug.txt b/test/snapshots/seattlerb/do_bug.txt
index 8226a3fa450..269d349519a 100644
--- a/test/snapshots/seattlerb/do_bug.txt
+++ b/test/snapshots/seattlerb/do_bug.txt
@@ -13,7 +13,7 @@ ProgramNode(0...33)(
        "a"
      ),
      CallNode(4...33)(
-       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "a"),
+       CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
        (5...6),
        (6...7),
        nil,
diff --git a/test/snapshots/seattlerb/dot2_nil__26.txt b/test/snapshots/seattlerb/dot2_nil__26.txt
index 2db10727011..38e8dfd9c0f 100644
--- a/test/snapshots/seattlerb/dot2_nil__26.txt
+++ b/test/snapshots/seattlerb/dot2_nil__26.txt
@@ -2,7 +2,7 @@ ProgramNode(0...3)(
   [],
   StatementsNode(0...3)(
     [RangeNode(0...3)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        nil,
        (1...3),
        0
diff --git a/test/snapshots/seattlerb/dot3_nil__26.txt b/test/snapshots/seattlerb/dot3_nil__26.txt
index fce5824c9da..91cf903a9a2 100644
--- a/test/snapshots/seattlerb/dot3_nil__26.txt
+++ b/test/snapshots/seattlerb/dot3_nil__26.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [RangeNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        nil,
        (1...4),
        1
diff --git a/test/snapshots/seattlerb/dstr_evstr.txt b/test/snapshots/seattlerb/dstr_evstr.txt
index c744aeee377..75377e9c7fa 100644
--- a/test/snapshots/seattlerb/dstr_evstr.txt
+++ b/test/snapshots/seattlerb/dstr_evstr.txt
@@ -13,7 +13,7 @@ ProgramNode(0...12)(
         EmbeddedStatementsNode(7...11)(
           (7...9),
           StatementsNode(9...10)(
-            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "b")]
+            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "b")]
           ),
           (10...11)
         )],
diff --git a/test/snapshots/seattlerb/dstr_evstr_empty_end.txt b/test/snapshots/seattlerb/dstr_evstr_empty_end.txt
index 113270b9c03..e4a9c81b885 100644
--- a/test/snapshots/seattlerb/dstr_evstr_empty_end.txt
+++ b/test/snapshots/seattlerb/dstr_evstr_empty_end.txt
@@ -14,7 +14,7 @@ ProgramNode(0...11)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "field"
              )]
           ),
diff --git a/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt b/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
index 805f6f9bd0e..e277d15a349 100644
--- a/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
+++ b/test/snapshots/seattlerb/eq_begin_why_wont_people_use_their_spacebar.txt
@@ -2,12 +2,12 @@ ProgramNode(0...29)(
   [],
   StatementsNode(0...29)(
     [CallNode(0...29)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "h"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "h"),
        nil,
        (1...4),
        (1...2),
        ArgumentsNode(2...29)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "k"),
+         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "k"),
           BeginNode(5...29)(
             (5...10),
             StatementsNode(18...20)([IntegerNode(18...20)()]),
diff --git a/test/snapshots/seattlerb/evstr_evstr.txt b/test/snapshots/seattlerb/evstr_evstr.txt
index e4b49cb84d6..f194b1b94a9 100644
--- a/test/snapshots/seattlerb/evstr_evstr.txt
+++ b/test/snapshots/seattlerb/evstr_evstr.txt
@@ -6,14 +6,14 @@ ProgramNode(0...10)(
        [EmbeddedStatementsNode(1...5)(
           (1...3),
           StatementsNode(3...4)(
-            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "a")]
+            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a")]
           ),
           (4...5)
         ),
         EmbeddedStatementsNode(5...9)(
           (5...7),
           StatementsNode(7...8)(
-            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "b")]
+            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
           ),
           (8...9)
         )],
diff --git a/test/snapshots/seattlerb/evstr_str.txt b/test/snapshots/seattlerb/evstr_str.txt
index 4571199189f..2ebd4e46398 100644
--- a/test/snapshots/seattlerb/evstr_str.txt
+++ b/test/snapshots/seattlerb/evstr_str.txt
@@ -6,7 +6,7 @@ ProgramNode(0...8)(
        [EmbeddedStatementsNode(1...5)(
           (1...3),
           StatementsNode(3...4)(
-            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "a")]
+            [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a")]
           ),
           (4...5)
         ),
diff --git a/test/snapshots/seattlerb/expr_not_bang.txt b/test/snapshots/seattlerb/expr_not_bang.txt
index ed1649eff8d..43e47cb03b4 100644
--- a/test/snapshots/seattlerb/expr_not_bang.txt
+++ b/test/snapshots/seattlerb/expr_not_bang.txt
@@ -8,7 +8,7 @@ ProgramNode(0...5)(
          (2...3),
          nil,
          ArgumentsNode(4...5)(
-           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b")]
+           [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b")]
          ),
          nil,
          nil,
diff --git a/test/snapshots/seattlerb/flip2_env_lvar.txt b/test/snapshots/seattlerb/flip2_env_lvar.txt
index 623be4987e7..a30207dddd5 100644
--- a/test/snapshots/seattlerb/flip2_env_lvar.txt
+++ b/test/snapshots/seattlerb/flip2_env_lvar.txt
@@ -4,8 +4,8 @@ ProgramNode(0...16)(
     [IfNode(0...16)(
        (0...2),
        RangeNode(3...7)(
-         CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "a"),
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b"),
+         CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a"),
+         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
          (4...6),
          0
        ),
diff --git a/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt b/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
index 92628b34710..d5f32777c12 100644
--- a/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
+++ b/test/snapshots/seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt
@@ -25,7 +25,7 @@ ProgramNode(0...20)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "bar"
                       )]
                    ),
diff --git a/test/snapshots/seattlerb/i_fucking_hate_line_numbers.txt b/test/snapshots/seattlerb/i_fucking_hate_line_numbers.txt
index 100e56df899..69736976411 100644
--- a/test/snapshots/seattlerb/i_fucking_hate_line_numbers.txt
+++ b/test/snapshots/seattlerb/i_fucking_hate_line_numbers.txt
@@ -17,7 +17,7 @@ ProgramNode(0...104)(
             "p"
           ),
           CallNode(16...21)(
-            CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 0, "a"),
+            CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
             (17...18),
             (18...19),
             nil,
@@ -28,7 +28,7 @@ ProgramNode(0...104)(
             "b"
           ),
           CallNode(24...32)(
-            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 0, "c"),
+            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "c"),
             (25...26),
             (26...27),
             nil,
@@ -41,7 +41,7 @@ ProgramNode(0...104)(
             "d"
           ),
           CallNode(35...40)(
-            CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 0, "e"),
+            CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "e"),
             (36...37),
             (37...38),
             nil,
@@ -52,7 +52,7 @@ ProgramNode(0...104)(
             "f"
           ),
           CallNode(43...51)(
-            CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 0, "g"),
+            CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 2, "g"),
             (44...45),
             (45...46),
             nil,
@@ -76,7 +76,7 @@ ProgramNode(0...104)(
             "p"
           ),
           CallNode(61...67)(
-            CallNode(61...62)(nil, nil, (61...62), nil, nil, nil, nil, 0, "a"),
+            CallNode(61...62)(nil, nil, (61...62), nil, nil, nil, nil, 2, "a"),
             (62...63),
             (63...64),
             (64...65),
@@ -87,7 +87,7 @@ ProgramNode(0...104)(
             "b"
           ),
           CallNode(70...79)(
-            CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 0, "c"),
+            CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 2, "c"),
             (71...72),
             (72...73),
             (73...74),
@@ -100,7 +100,7 @@ ProgramNode(0...104)(
             "d"
           ),
           CallNode(82...88)(
-            CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 0, "e"),
+            CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "e"),
             (83...84),
             (84...85),
             (85...86),
@@ -111,7 +111,7 @@ ProgramNode(0...104)(
             "f"
           ),
           CallNode(91...100)(
-            CallNode(91...92)(nil, nil, (91...92), nil, nil, nil, nil, 0, "g"),
+            CallNode(91...92)(nil, nil, (91...92), nil, nil, nil, nil, 2, "g"),
             (92...93),
             (93...94),
             (94...95),
diff --git a/test/snapshots/seattlerb/i_fucking_hate_line_numbers2.txt b/test/snapshots/seattlerb/i_fucking_hate_line_numbers2.txt
index 49bb7112322..86433437ce1 100644
--- a/test/snapshots/seattlerb/i_fucking_hate_line_numbers2.txt
+++ b/test/snapshots/seattlerb/i_fucking_hate_line_numbers2.txt
@@ -47,6 +47,6 @@ ProgramNode(0...48)(
        nil,
        (43...46)
      ),
-     CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 0, "a")]
+     CallNode(47...48)(nil, nil, (47...48), nil, nil, nil, nil, 2, "a")]
   )
 )
diff --git a/test/snapshots/seattlerb/index_0.txt b/test/snapshots/seattlerb/index_0.txt
index 7e2d6f980ff..42a72397529 100644
--- a/test/snapshots/seattlerb/index_0.txt
+++ b/test/snapshots/seattlerb/index_0.txt
@@ -2,12 +2,12 @@ ProgramNode(0...7)(
   [],
   StatementsNode(0...7)(
     [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        nil,
        (1...3),
        (1...2),
        ArgumentsNode(6...7)(
-         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b")]
+         [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
        ),
        (2...3),
        nil,
diff --git a/test/snapshots/seattlerb/index_0_opasgn.txt b/test/snapshots/seattlerb/index_0_opasgn.txt
index 3271bfa5980..1f6d27974ed 100644
--- a/test/snapshots/seattlerb/index_0_opasgn.txt
+++ b/test/snapshots/seattlerb/index_0_opasgn.txt
@@ -3,7 +3,7 @@ ProgramNode(0...8)(
   StatementsNode(0...8)(
     [CallOperatorWriteNode(0...8)(
        CallNode(0...3)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          nil,
          (1...3),
          (1...2),
@@ -14,7 +14,7 @@ ProgramNode(0...8)(
          "[]="
        ),
        (4...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "b"),
+       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b"),
        :+
      )]
   )
diff --git a/test/snapshots/seattlerb/kill_me4.txt b/test/snapshots/seattlerb/kill_me4.txt
index 80211017a6d..afca77c5fa3 100644
--- a/test/snapshots/seattlerb/kill_me4.txt
+++ b/test/snapshots/seattlerb/kill_me4.txt
@@ -6,7 +6,7 @@ ProgramNode(0...17)(
        0,
        IfNode(2...17)(
          nil,
-         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "b"),
+         CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
          StatementsNode(6...10)([TrueNode(6...10)()]),
          ElseNode(10...17)(
            (10...11),
diff --git a/test/snapshots/seattlerb/label_vs_string.txt b/test/snapshots/seattlerb/label_vs_string.txt
index bc2718a2084..f647e6da0e4 100644
--- a/test/snapshots/seattlerb/label_vs_string.txt
+++ b/test/snapshots/seattlerb/label_vs_string.txt
@@ -2,7 +2,7 @@ ProgramNode(0...12)(
   [],
   StatementsNode(0...12)(
     [CallNode(0...12)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 0, "_buf"),
+       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "_buf"),
        nil,
        (5...7),
        nil,
diff --git a/test/snapshots/seattlerb/lasgn_command.txt b/test/snapshots/seattlerb/lasgn_command.txt
index 3f27e4f78c1..696be787160 100644
--- a/test/snapshots/seattlerb/lasgn_command.txt
+++ b/test/snapshots/seattlerb/lasgn_command.txt
@@ -5,7 +5,7 @@ ProgramNode(0...9)(
        :a,
        0,
        CallNode(4...9)(
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b"),
+         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
          (5...6),
          (6...7),
          nil,
diff --git a/test/snapshots/seattlerb/lasgn_middle_splat.txt b/test/snapshots/seattlerb/lasgn_middle_splat.txt
index b9cb8e9f9b0..623f6dc1257 100644
--- a/test/snapshots/seattlerb/lasgn_middle_splat.txt
+++ b/test/snapshots/seattlerb/lasgn_middle_splat.txt
@@ -5,12 +5,12 @@ ProgramNode(0...12)(
        :a,
        0,
        ArrayNode(4...12)(
-         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b"),
+         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
           SplatNode(7...9)(
             (7...8),
-            CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "c")
+            CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c")
           ),
-          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "d")],
+          CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d")],
          nil,
          nil
        ),
diff --git a/test/snapshots/seattlerb/masgn_anon_splat_arg.txt b/test/snapshots/seattlerb/masgn_anon_splat_arg.txt
index eb18d7615bf..738ee251658 100644
--- a/test/snapshots/seattlerb/masgn_anon_splat_arg.txt
+++ b/test/snapshots/seattlerb/masgn_anon_splat_arg.txt
@@ -11,7 +11,7 @@ ProgramNode(0...8)(
         ),
         LocalVariableWriteNode(3...4)(:a, 0, nil, (3...4), nil)],
        (5...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "b"),
+       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_arg_colon_arg.txt b/test/snapshots/seattlerb/masgn_arg_colon_arg.txt
index 4b90bf3ddc4..1b1c0f43bad 100644
--- a/test/snapshots/seattlerb/masgn_arg_colon_arg.txt
+++ b/test/snapshots/seattlerb/masgn_arg_colon_arg.txt
@@ -4,7 +4,7 @@ ProgramNode(0...11)(
     [MultiWriteNode(0...11)(
        [LocalVariableWriteNode(0...1)(:a, 0, nil, (0...1), nil),
         CallNode(3...7)(
-          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "b"),
+          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
           (4...6),
           (6...7),
           nil,
@@ -15,7 +15,7 @@ ProgramNode(0...11)(
           "c="
         )],
        (8...9),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "d"),
+       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_arg_ident.txt b/test/snapshots/seattlerb/masgn_arg_ident.txt
index 7ca20a45ada..53ecd8fd183 100644
--- a/test/snapshots/seattlerb/masgn_arg_ident.txt
+++ b/test/snapshots/seattlerb/masgn_arg_ident.txt
@@ -4,7 +4,7 @@ ProgramNode(0...10)(
     [MultiWriteNode(0...10)(
        [LocalVariableWriteNode(0...1)(:a, 0, nil, (0...1), nil),
         CallNode(3...6)(
-          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "b"),
+          CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
           (4...5),
           (5...6),
           nil,
@@ -15,7 +15,7 @@ ProgramNode(0...10)(
           "C="
         )],
        (7...8),
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "d"),
+       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "d"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_arg_splat_arg.txt b/test/snapshots/seattlerb/masgn_arg_splat_arg.txt
index cdabe61852f..285c22f660b 100644
--- a/test/snapshots/seattlerb/masgn_arg_splat_arg.txt
+++ b/test/snapshots/seattlerb/masgn_arg_splat_arg.txt
@@ -9,7 +9,7 @@ ProgramNode(0...12)(
         ),
         LocalVariableWriteNode(7...8)(:c, 0, nil, (7...8), nil)],
        (9...10),
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "d"),
+       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_colon2.txt b/test/snapshots/seattlerb/masgn_colon2.txt
index 32d035afa3e..490d1657b03 100644
--- a/test/snapshots/seattlerb/masgn_colon2.txt
+++ b/test/snapshots/seattlerb/masgn_colon2.txt
@@ -5,7 +5,7 @@ ProgramNode(0...14)(
        [LocalVariableWriteNode(0...1)(:a, 0, nil, (0...1), nil),
         ConstantPathWriteNode(3...7)(
           ConstantPathNode(3...7)(
-            CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "b"),
+            CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "b"),
             ConstantReadNode(6...7)(),
             (4...6)
           ),
diff --git a/test/snapshots/seattlerb/masgn_command_call.txt b/test/snapshots/seattlerb/masgn_command_call.txt
index 8ffc56de6ff..ef2eab9d34e 100644
--- a/test/snapshots/seattlerb/masgn_command_call.txt
+++ b/test/snapshots/seattlerb/masgn_command_call.txt
@@ -6,7 +6,7 @@ ProgramNode(0...10)(
         SplatNode(1...2)((1...2), nil)],
        (3...4),
        CallNode(5...10)(
-         CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "b"),
+         CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b"),
          (6...7),
          (7...8),
          nil,
diff --git a/test/snapshots/seattlerb/masgn_double_paren.txt b/test/snapshots/seattlerb/masgn_double_paren.txt
index 85b4f05f312..4f19128a219 100644
--- a/test/snapshots/seattlerb/masgn_double_paren.txt
+++ b/test/snapshots/seattlerb/masgn_double_paren.txt
@@ -11,7 +11,7 @@ ProgramNode(2...9)(
           (5...6)
         )],
        (7...8),
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "c"),
+       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c"),
        (0...1),
        (6...7)
      )]
diff --git a/test/snapshots/seattlerb/masgn_paren.txt b/test/snapshots/seattlerb/masgn_paren.txt
index cdf4678bc41..b47b00c417f 100644
--- a/test/snapshots/seattlerb/masgn_paren.txt
+++ b/test/snapshots/seattlerb/masgn_paren.txt
@@ -6,7 +6,7 @@ ProgramNode(1...12)(
         LocalVariableWriteNode(4...5)(:b, 0, nil, (4...5), nil)],
        (7...8),
        CallNode(9...12)(
-         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "c"),
+         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c"),
          (10...11),
          (11...12),
          nil,
diff --git a/test/snapshots/seattlerb/masgn_splat_arg.txt b/test/snapshots/seattlerb/masgn_splat_arg.txt
index 783ddde19aa..21844a7c542 100644
--- a/test/snapshots/seattlerb/masgn_splat_arg.txt
+++ b/test/snapshots/seattlerb/masgn_splat_arg.txt
@@ -14,7 +14,7 @@ ProgramNode(0...9)(
         ),
         LocalVariableWriteNode(4...5)(:b, 0, nil, (4...5), nil)],
        (6...7),
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "c"),
+       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_splat_arg_arg.txt b/test/snapshots/seattlerb/masgn_splat_arg_arg.txt
index be516e972b5..af7f0b1b357 100644
--- a/test/snapshots/seattlerb/masgn_splat_arg_arg.txt
+++ b/test/snapshots/seattlerb/masgn_splat_arg_arg.txt
@@ -15,7 +15,7 @@ ProgramNode(0...12)(
         LocalVariableWriteNode(4...5)(:b, 0, nil, (4...5), nil),
         LocalVariableWriteNode(7...8)(:c, 0, nil, (7...8), nil)],
        (9...10),
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "d"),
+       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "d"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/masgn_var_star_var.txt b/test/snapshots/seattlerb/masgn_var_star_var.txt
index b172d0bb868..b2ce2af1738 100644
--- a/test/snapshots/seattlerb/masgn_var_star_var.txt
+++ b/test/snapshots/seattlerb/masgn_var_star_var.txt
@@ -6,7 +6,7 @@ ProgramNode(0...11)(
         SplatNode(3...4)((3...4), nil),
         LocalVariableWriteNode(6...7)(:b, 0, nil, (6...7), nil)],
        (8...9),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "c"),
+       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "c"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/messy_op_asgn_lineno.txt b/test/snapshots/seattlerb/messy_op_asgn_lineno.txt
index 146ce2d61ad..71a28870bd2 100644
--- a/test/snapshots/seattlerb/messy_op_asgn_lineno.txt
+++ b/test/snapshots/seattlerb/messy_op_asgn_lineno.txt
@@ -30,7 +30,7 @@ ProgramNode(0...15)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "e"
                       )]
                    ),
diff --git a/test/snapshots/seattlerb/method_call_assoc_trailing_comma.txt b/test/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
index 9b8bec66d2d..1c0c544e85d 100644
--- a/test/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
+++ b/test/snapshots/seattlerb/method_call_assoc_trailing_comma.txt
@@ -2,7 +2,7 @@ ProgramNode(0...10)(
   [],
   StatementsNode(0...10)(
     [CallNode(0...10)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        (3...4),
diff --git a/test/snapshots/seattlerb/method_call_trailing_comma.txt b/test/snapshots/seattlerb/method_call_trailing_comma.txt
index 93a93d6a15f..18089701db8 100644
--- a/test/snapshots/seattlerb/method_call_trailing_comma.txt
+++ b/test/snapshots/seattlerb/method_call_trailing_comma.txt
@@ -2,7 +2,7 @@ ProgramNode(0...7)(
   [],
   StatementsNode(0...7)(
     [CallNode(0...7)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        (3...4),
diff --git a/test/snapshots/seattlerb/mlhs_back_anonsplat.txt b/test/snapshots/seattlerb/mlhs_back_anonsplat.txt
index 410cfc8f147..c046218e1ee 100644
--- a/test/snapshots/seattlerb/mlhs_back_anonsplat.txt
+++ b/test/snapshots/seattlerb/mlhs_back_anonsplat.txt
@@ -7,7 +7,7 @@ ProgramNode(0...14)(
         LocalVariableWriteNode(6...7)(:c, 0, nil, (6...7), nil),
         SplatNode(9...10)((9...10), nil)],
        (11...12),
-       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "f"),
+       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_back_splat.txt b/test/snapshots/seattlerb/mlhs_back_splat.txt
index 8086347e139..1ba49176842 100644
--- a/test/snapshots/seattlerb/mlhs_back_splat.txt
+++ b/test/snapshots/seattlerb/mlhs_back_splat.txt
@@ -10,7 +10,7 @@ ProgramNode(0...15)(
           LocalVariableWriteNode(10...11)(:s, 0, nil, (10...11), nil)
         )],
        (12...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "f"),
+       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_front_anonsplat.txt b/test/snapshots/seattlerb/mlhs_front_anonsplat.txt
index beaadf1892c..b035fbb8b7d 100644
--- a/test/snapshots/seattlerb/mlhs_front_anonsplat.txt
+++ b/test/snapshots/seattlerb/mlhs_front_anonsplat.txt
@@ -13,7 +13,7 @@ ProgramNode(0...14)(
         LocalVariableWriteNode(6...7)(:y, 0, nil, (6...7), nil),
         LocalVariableWriteNode(9...10)(:z, 0, nil, (9...10), nil)],
        (11...12),
-       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "f"),
+       CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_front_splat.txt b/test/snapshots/seattlerb/mlhs_front_splat.txt
index 0c786546d32..653b0e167ff 100644
--- a/test/snapshots/seattlerb/mlhs_front_splat.txt
+++ b/test/snapshots/seattlerb/mlhs_front_splat.txt
@@ -16,7 +16,7 @@ ProgramNode(0...15)(
         LocalVariableWriteNode(7...8)(:y, 0, nil, (7...8), nil),
         LocalVariableWriteNode(10...11)(:z, 0, nil, (10...11), nil)],
        (12...13),
-       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "f"),
+       CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_keyword.txt b/test/snapshots/seattlerb/mlhs_keyword.txt
index 2b5fc37ee07..8910c8b5d1a 100644
--- a/test/snapshots/seattlerb/mlhs_keyword.txt
+++ b/test/snapshots/seattlerb/mlhs_keyword.txt
@@ -2,7 +2,7 @@ ProgramNode(0...16)(
   [],
   StatementsNode(0...16)(
     [CallNode(0...16)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...4),
        (4...5),
diff --git a/test/snapshots/seattlerb/mlhs_mid_anonsplat.txt b/test/snapshots/seattlerb/mlhs_mid_anonsplat.txt
index 54cab7d7f81..313a4590f7f 100644
--- a/test/snapshots/seattlerb/mlhs_mid_anonsplat.txt
+++ b/test/snapshots/seattlerb/mlhs_mid_anonsplat.txt
@@ -10,7 +10,7 @@ ProgramNode(0...23)(
         LocalVariableWriteNode(15...16)(:y, 0, nil, (15...16), nil),
         LocalVariableWriteNode(18...19)(:z, 0, nil, (18...19), nil)],
        (20...21),
-       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 0, "f"),
+       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_mid_splat.txt b/test/snapshots/seattlerb/mlhs_mid_splat.txt
index e8dd882dd29..5e307e81944 100644
--- a/test/snapshots/seattlerb/mlhs_mid_splat.txt
+++ b/test/snapshots/seattlerb/mlhs_mid_splat.txt
@@ -13,7 +13,7 @@ ProgramNode(0...24)(
         LocalVariableWriteNode(16...17)(:y, 0, nil, (16...17), nil),
         LocalVariableWriteNode(19...20)(:z, 0, nil, (19...20), nil)],
        (21...22),
-       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 0, "f"),
+       CallNode(23...24)(nil, nil, (23...24), nil, nil, nil, nil, 2, "f"),
        nil,
        nil
      )]
diff --git a/test/snapshots/seattlerb/mlhs_rescue.txt b/test/snapshots/seattlerb/mlhs_rescue.txt
index cd6276e76e1..13d418461bc 100644
--- a/test/snapshots/seattlerb/mlhs_rescue.txt
+++ b/test/snapshots/seattlerb/mlhs_rescue.txt
@@ -6,7 +6,7 @@ ProgramNode(0...18)(
         LocalVariableWriteNode(3...4)(:b, 0, nil, (3...4), nil)],
        (5...6),
        RescueModifierNode(7...18)(
-         CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "f"),
+         CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "f"),
          (9...15),
          IntegerNode(16...18)()
        ),
diff --git a/test/snapshots/seattlerb/motherfuckin_leading_dots.txt b/test/snapshots/seattlerb/motherfuckin_leading_dots.txt
index 352bcbab600..881cc6d5a87 100644
--- a/test/snapshots/seattlerb/motherfuckin_leading_dots.txt
+++ b/test/snapshots/seattlerb/motherfuckin_leading_dots.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (2...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/op_asgn_command_call.txt b/test/snapshots/seattlerb/op_asgn_command_call.txt
index 256a063f406..1daadaab679 100644
--- a/test/snapshots/seattlerb/op_asgn_command_call.txt
+++ b/test/snapshots/seattlerb/op_asgn_command_call.txt
@@ -5,7 +5,7 @@ ProgramNode(0...11)(
        (0...1),
        (2...5),
        CallNode(6...11)(
-         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b"),
+         CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b"),
          (7...8),
          (8...9),
          nil,
diff --git a/test/snapshots/seattlerb/op_asgn_index_command_call.txt b/test/snapshots/seattlerb/op_asgn_index_command_call.txt
index 9b7b6f93da0..5ae2a48469e 100644
--- a/test/snapshots/seattlerb/op_asgn_index_command_call.txt
+++ b/test/snapshots/seattlerb/op_asgn_index_command_call.txt
@@ -3,7 +3,7 @@ ProgramNode(0...16)(
   StatementsNode(0...16)(
     [CallOperatorOrWriteNode(0...16)(
        CallNode(0...5)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          nil,
          (1...5),
          (1...2),
diff --git a/test/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt b/test/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
index 051acb85b53..0cd3775202d 100644
--- a/test/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
+++ b/test/snapshots/seattlerb/op_asgn_primary_colon_const_command_call.txt
@@ -14,7 +14,7 @@ ProgramNode(0...11)(
          (8...9),
          nil,
          ArgumentsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "d")]
+           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d")]
          ),
          nil,
          nil,
diff --git a/test/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt b/test/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
index 5ca0e3ce5c1..5f369122ffa 100644
--- a/test/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
+++ b/test/snapshots/seattlerb/op_asgn_primary_colon_identifier_command_call.txt
@@ -20,7 +20,7 @@ ProgramNode(0...11)(
          (8...9),
          nil,
          ArgumentsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "d")]
+           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "d")]
          ),
          nil,
          nil,
diff --git a/test/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt b/test/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
index 363660cf20a..2d5ef0f0df2 100644
--- a/test/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
+++ b/test/snapshots/seattlerb/op_asgn_val_dot_ident_command_call.txt
@@ -3,7 +3,7 @@ ProgramNode(0...11)(
   StatementsNode(0...11)(
     [CallOperatorOrWriteNode(0...11)(
        CallNode(0...3)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...2),
          (2...3),
          nil,
diff --git a/test/snapshots/seattlerb/parse_if_not_canonical.txt b/test/snapshots/seattlerb/parse_if_not_canonical.txt
index 3d90e11f4c8..223ede6af85 100644
--- a/test/snapshots/seattlerb/parse_if_not_canonical.txt
+++ b/test/snapshots/seattlerb/parse_if_not_canonical.txt
@@ -5,7 +5,7 @@ ProgramNode(0...41)(
        (0...2),
        CallNode(3...15)(
          CallNode(7...15)(
-           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "var"),
+           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "var"),
            (10...11),
            (11...15),
            nil,
diff --git a/test/snapshots/seattlerb/parse_if_not_noncanonical.txt b/test/snapshots/seattlerb/parse_if_not_noncanonical.txt
index 3d90e11f4c8..223ede6af85 100644
--- a/test/snapshots/seattlerb/parse_if_not_noncanonical.txt
+++ b/test/snapshots/seattlerb/parse_if_not_noncanonical.txt
@@ -5,7 +5,7 @@ ProgramNode(0...41)(
        (0...2),
        CallNode(3...15)(
          CallNode(7...15)(
-           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "var"),
+           CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "var"),
            (10...11),
            (11...15),
            nil,
diff --git a/test/snapshots/seattlerb/parse_line_block_inline_comment.txt b/test/snapshots/seattlerb/parse_line_block_inline_comment.txt
index 76b2ec33fab..f6f0333e91d 100644
--- a/test/snapshots/seattlerb/parse_line_block_inline_comment.txt
+++ b/test/snapshots/seattlerb/parse_line_block_inline_comment.txt
@@ -1,8 +1,8 @@
 ProgramNode(0...15)(
   [],
   StatementsNode(0...15)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
-     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "b"),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "c")]
+    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
+     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
+     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt b/test/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
index 0345dae43e9..2650fb5c12a 100644
--- a/test/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
+++ b/test/snapshots/seattlerb/parse_line_block_inline_comment_leading_newlines.txt
@@ -1,8 +1,8 @@
 ProgramNode(3...36)(
   [],
   StatementsNode(3...36)(
-    [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 0, "a"),
-     CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "b"),
-     CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 0, "c")]
+    [CallNode(3...4)(nil, nil, (3...4), nil, nil, nil, nil, 2, "a"),
+     CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b"),
+     CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt b/test/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
index d8486cb823a..0a01c627fbb 100644
--- a/test/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
+++ b/test/snapshots/seattlerb/parse_line_block_inline_multiline_comment.txt
@@ -1,8 +1,8 @@
 ProgramNode(0...33)(
   [],
   StatementsNode(0...33)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
-     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "b"),
-     CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 0, "c")]
+    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
+     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b"),
+     CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_dot2.txt b/test/snapshots/seattlerb/parse_line_dot2.txt
index b535ac7c1c9..04d53e2c517 100644
--- a/test/snapshots/seattlerb/parse_line_dot2.txt
+++ b/test/snapshots/seattlerb/parse_line_dot2.txt
@@ -3,11 +3,11 @@ ProgramNode(0...13)(
   StatementsNode(0...13)(
     [RangeNode(0...5)(IntegerNode(0...1)(), IntegerNode(4...5)(), (1...3), 0),
      RangeNode(6...11)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "a"),
-       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "b"),
+       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a"),
+       CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "b"),
        (7...9),
        0
      ),
-     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 0, "c")]
+     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_dot2_open.txt b/test/snapshots/seattlerb/parse_line_dot2_open.txt
index 757e052c080..35faa728edc 100644
--- a/test/snapshots/seattlerb/parse_line_dot2_open.txt
+++ b/test/snapshots/seattlerb/parse_line_dot2_open.txt
@@ -3,11 +3,11 @@ ProgramNode(0...13)(
   StatementsNode(0...13)(
     [RangeNode(0...3)(IntegerNode(0...1)(), nil, (1...3), 0),
      RangeNode(6...9)(
-       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "a"),
+       CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "a"),
        nil,
        (7...9),
        0
      ),
-     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 0, "c")]
+     CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_dot3.txt b/test/snapshots/seattlerb/parse_line_dot3.txt
index d50e6dc275a..109bbadc623 100644
--- a/test/snapshots/seattlerb/parse_line_dot3.txt
+++ b/test/snapshots/seattlerb/parse_line_dot3.txt
@@ -3,11 +3,11 @@ ProgramNode(0...15)(
   StatementsNode(0...15)(
     [RangeNode(0...6)(IntegerNode(0...1)(), IntegerNode(5...6)(), (1...4), 1),
      RangeNode(7...13)(
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "a"),
-       CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 0, "b"),
+       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a"),
+       CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "b"),
        (8...11),
        1
      ),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "c")]
+     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_dot3_open.txt b/test/snapshots/seattlerb/parse_line_dot3_open.txt
index 16cdc0cce8f..558c430b6a6 100644
--- a/test/snapshots/seattlerb/parse_line_dot3_open.txt
+++ b/test/snapshots/seattlerb/parse_line_dot3_open.txt
@@ -3,11 +3,11 @@ ProgramNode(0...15)(
   StatementsNode(0...15)(
     [RangeNode(0...4)(IntegerNode(0...1)(), nil, (1...4), 1),
      RangeNode(7...11)(
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "a"),
+       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "a"),
        nil,
        (8...11),
        1
      ),
-     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "c")]
+     CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "c")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_evstr_after_break.txt b/test/snapshots/seattlerb/parse_line_evstr_after_break.txt
index 3807c61b206..ac4be36fcca 100644
--- a/test/snapshots/seattlerb/parse_line_evstr_after_break.txt
+++ b/test/snapshots/seattlerb/parse_line_evstr_after_break.txt
@@ -8,7 +8,7 @@ ProgramNode(0...11)(
          [EmbeddedStatementsNode(6...10)(
             (6...8),
             StatementsNode(8...9)(
-              [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "b")]
+              [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
             ),
             (9...10)
           )],
diff --git a/test/snapshots/seattlerb/parse_line_heredoc_evstr.txt b/test/snapshots/seattlerb/parse_line_heredoc_evstr.txt
index e24231dcf9a..23122ab3673 100644
--- a/test/snapshots/seattlerb/parse_line_heredoc_evstr.txt
+++ b/test/snapshots/seattlerb/parse_line_heredoc_evstr.txt
@@ -7,7 +7,7 @@ ProgramNode(0...14)(
         EmbeddedStatementsNode(7...11)(
           (7...9),
           StatementsNode(9...10)(
-            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "b")]
+            [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "b")]
           ),
           (10...11)
         ),
diff --git a/test/snapshots/seattlerb/parse_line_iter_call_no_parens.txt b/test/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
index 53c7b386602..82dd3ce64f6 100644
--- a/test/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
+++ b/test/snapshots/seattlerb/parse_line_iter_call_no_parens.txt
@@ -7,7 +7,7 @@ ProgramNode(0...25)(
        (0...1),
        nil,
        ArgumentsNode(2...3)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a")]
+         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        BlockNode(4...25)(
diff --git a/test/snapshots/seattlerb/parse_line_iter_call_parens.txt b/test/snapshots/seattlerb/parse_line_iter_call_parens.txt
index 229243ea666..db09ae12d0b 100644
--- a/test/snapshots/seattlerb/parse_line_iter_call_parens.txt
+++ b/test/snapshots/seattlerb/parse_line_iter_call_parens.txt
@@ -7,7 +7,7 @@ ProgramNode(0...26)(
        (0...1),
        (1...2),
        ArgumentsNode(2...3)(
-         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a")]
+         [CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a")]
        ),
        (3...4),
        BlockNode(5...26)(
diff --git a/test/snapshots/seattlerb/parse_line_op_asgn.txt b/test/snapshots/seattlerb/parse_line_op_asgn.txt
index e65af5c08d0..011858c31e5 100644
--- a/test/snapshots/seattlerb/parse_line_op_asgn.txt
+++ b/test/snapshots/seattlerb/parse_line_op_asgn.txt
@@ -4,10 +4,10 @@ ProgramNode(6...34)(
     [LocalVariableOperatorWriteNode(6...24)(
        (6...9),
        (10...12),
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "bar"),
+       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "bar"),
        :foo,
        :+
      ),
-     CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 0, "baz")]
+     CallNode(31...34)(nil, nil, (31...34), nil, nil, nil, nil, 2, "baz")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_postexe.txt b/test/snapshots/seattlerb/parse_line_postexe.txt
index 775d2092728..9e527ea587c 100644
--- a/test/snapshots/seattlerb/parse_line_postexe.txt
+++ b/test/snapshots/seattlerb/parse_line_postexe.txt
@@ -3,7 +3,7 @@ ProgramNode(0...11)(
   StatementsNode(0...11)(
     [PostExecutionNode(0...11)(
        StatementsNode(6...9)(
-         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
        ),
        (0...3),
        (4...5),
diff --git a/test/snapshots/seattlerb/parse_line_preexe.txt b/test/snapshots/seattlerb/parse_line_preexe.txt
index 59ede98b60f..49f485c79fc 100644
--- a/test/snapshots/seattlerb/parse_line_preexe.txt
+++ b/test/snapshots/seattlerb/parse_line_preexe.txt
@@ -3,7 +3,7 @@ ProgramNode(0...13)(
   StatementsNode(0...13)(
     [PreExecutionNode(0...13)(
        StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "foo")]
        ),
        (0...5),
        (6...7),
diff --git a/test/snapshots/seattlerb/parse_line_rescue.txt b/test/snapshots/seattlerb/parse_line_rescue.txt
index 1a1fc6b01d5..02704b5790f 100644
--- a/test/snapshots/seattlerb/parse_line_rescue.txt
+++ b/test/snapshots/seattlerb/parse_line_rescue.txt
@@ -4,7 +4,7 @@ ProgramNode(0...35)(
     [BeginNode(0...35)(
        (0...5),
        StatementsNode(8...9)(
-         [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "a")]
+         [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "a")]
        ),
        RescueNode(10...31)(
          (10...16),
@@ -12,7 +12,7 @@ ProgramNode(0...35)(
          nil,
          nil,
          StatementsNode(19...20)(
-           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 0, "b")]
+           [CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b")]
          ),
          RescueNode(21...31)(
            (21...27),
@@ -28,7 +28,7 @@ ProgramNode(0...35)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
diff --git a/test/snapshots/seattlerb/parse_line_to_ary.txt b/test/snapshots/seattlerb/parse_line_to_ary.txt
index da2c3f5b238..ed1ab308658 100644
--- a/test/snapshots/seattlerb/parse_line_to_ary.txt
+++ b/test/snapshots/seattlerb/parse_line_to_ary.txt
@@ -5,10 +5,10 @@ ProgramNode(0...10)(
        [LocalVariableWriteNode(0...1)(:a, 0, nil, (0...1), nil),
         LocalVariableWriteNode(3...4)(:b, 0, nil, (3...4), nil)],
        (5...6),
-       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "c"),
+       CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "c"),
        nil,
        nil
      ),
-     CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "d")]
+     CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "d")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_line_trailing_newlines.txt b/test/snapshots/seattlerb/parse_line_trailing_newlines.txt
index c28a53ddc85..e48c600649b 100644
--- a/test/snapshots/seattlerb/parse_line_trailing_newlines.txt
+++ b/test/snapshots/seattlerb/parse_line_trailing_newlines.txt
@@ -1,7 +1,7 @@
 ProgramNode(0...3)(
   [],
   StatementsNode(0...3)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
-     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "b")]
+    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
+     CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/parse_pattern_044.txt b/test/snapshots/seattlerb/parse_pattern_044.txt
index 572197b776d..2788137784b 100644
--- a/test/snapshots/seattlerb/parse_pattern_044.txt
+++ b/test/snapshots/seattlerb/parse_pattern_044.txt
@@ -2,7 +2,7 @@ ProgramNode(0...31)(
   [],
   StatementsNode(0...31)(
     [CaseNode(0...31)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "obj"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "obj"),
        [InNode(9...27)(
           ArrayPatternNode(12...20)(
             ConstantReadNode(12...18)(),
diff --git a/test/snapshots/seattlerb/parse_until_not_canonical.txt b/test/snapshots/seattlerb/parse_until_not_canonical.txt
index 6ac4c6f0420..0cd0cef1e3e 100644
--- a/test/snapshots/seattlerb/parse_until_not_canonical.txt
+++ b/test/snapshots/seattlerb/parse_until_not_canonical.txt
@@ -13,7 +13,7 @@ ProgramNode(0...30)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "var"
            ),
            (13...14),
diff --git a/test/snapshots/seattlerb/parse_until_not_noncanonical.txt b/test/snapshots/seattlerb/parse_until_not_noncanonical.txt
index 6ac4c6f0420..0cd0cef1e3e 100644
--- a/test/snapshots/seattlerb/parse_until_not_noncanonical.txt
+++ b/test/snapshots/seattlerb/parse_until_not_noncanonical.txt
@@ -13,7 +13,7 @@ ProgramNode(0...30)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "var"
            ),
            (13...14),
diff --git a/test/snapshots/seattlerb/parse_while_not_canonical.txt b/test/snapshots/seattlerb/parse_while_not_canonical.txt
index 754694cefe1..60320837ac9 100644
--- a/test/snapshots/seattlerb/parse_while_not_canonical.txt
+++ b/test/snapshots/seattlerb/parse_while_not_canonical.txt
@@ -13,7 +13,7 @@ ProgramNode(0...30)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "var"
            ),
            (13...14),
diff --git a/test/snapshots/seattlerb/parse_while_not_noncanonical.txt b/test/snapshots/seattlerb/parse_while_not_noncanonical.txt
index 754694cefe1..60320837ac9 100644
--- a/test/snapshots/seattlerb/parse_while_not_noncanonical.txt
+++ b/test/snapshots/seattlerb/parse_while_not_noncanonical.txt
@@ -13,7 +13,7 @@ ProgramNode(0...30)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "var"
            ),
            (13...14),
diff --git a/test/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt b/test/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
deleted file mode 100644
index 89ce74ce196..00000000000
--- a/test/snapshots/seattlerb/pct_w_heredoc_interp_nested.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ProgramNode(0...30)(
-  [],
-  StatementsNode(0...30)(
-    [ArrayNode(0...30)(
-       [StringNode(4...5)(nil, (4...5), nil, "1"),
-        InterpolatedStringNode(0...12)(
-          nil,
-          [EmbeddedStatementsNode(6...12)(
-             (6...8),
-             StatementsNode(8...19)(
-               [InterpolatedStringNode(8...19)(
-                  (8...11),
-                  [StringNode(15...17)(nil, (15...17), nil, "2\n")],
-                  (17...19)
-                )]
-             ),
-             (11...12)
-           )],
-          nil
-        ),
-        StringNode(13...14)(nil, (13...14), nil, "3"),
-        StringNode(25...26)(nil, (25...26), nil, "4"),
-        StringNode(27...28)(nil, (27...28), nil, "5")],
-       (0...3),
-       (29...30)
-     )]
-  )
-)
diff --git a/test/snapshots/seattlerb/pipe_semicolon.txt b/test/snapshots/seattlerb/pipe_semicolon.txt
index 912eef61760..cd40d9ac0b1 100644
--- a/test/snapshots/seattlerb/pipe_semicolon.txt
+++ b/test/snapshots/seattlerb/pipe_semicolon.txt
@@ -2,7 +2,7 @@ ProgramNode(0...18)(
   [],
   StatementsNode(0...18)(
     [CallNode(0...18)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        nil,
diff --git a/test/snapshots/seattlerb/pipe_space.txt b/test/snapshots/seattlerb/pipe_space.txt
index dc569222e16..8c66905d04c 100644
--- a/test/snapshots/seattlerb/pipe_space.txt
+++ b/test/snapshots/seattlerb/pipe_space.txt
@@ -2,7 +2,7 @@ ProgramNode(0...14)(
   [],
   StatementsNode(0...14)(
     [CallNode(0...14)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        nil,
diff --git a/test/snapshots/seattlerb/rescue_do_end_raised.txt b/test/snapshots/seattlerb/rescue_do_end_raised.txt
index 7209e7eb47f..f4e4cda3ee3 100644
--- a/test/snapshots/seattlerb/rescue_do_end_raised.txt
+++ b/test/snapshots/seattlerb/rescue_do_end_raised.txt
@@ -22,7 +22,7 @@ ProgramNode(0...35)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "raise"
               )]
            ),
diff --git a/test/snapshots/seattlerb/rescue_do_end_rescued.txt b/test/snapshots/seattlerb/rescue_do_end_rescued.txt
index 07d7a0aa6ac..5376935a827 100644
--- a/test/snapshots/seattlerb/rescue_do_end_rescued.txt
+++ b/test/snapshots/seattlerb/rescue_do_end_rescued.txt
@@ -22,7 +22,7 @@ ProgramNode(0...65)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "raise"
               )]
            ),
diff --git a/test/snapshots/seattlerb/rescue_in_block.txt b/test/snapshots/seattlerb/rescue_in_block.txt
index 0a9d0408149..2f096cdf741 100644
--- a/test/snapshots/seattlerb/rescue_in_block.txt
+++ b/test/snapshots/seattlerb/rescue_in_block.txt
@@ -28,7 +28,7 @@ ProgramNode(0...26)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "stuff"
                 )]
              ),
diff --git a/test/snapshots/seattlerb/rescue_parens.txt b/test/snapshots/seattlerb/rescue_parens.txt
index f7f6a7783e8..c672e59e6f6 100644
--- a/test/snapshots/seattlerb/rescue_parens.txt
+++ b/test/snapshots/seattlerb/rescue_parens.txt
@@ -18,7 +18,7 @@ ProgramNode(0...14)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "b"
                  ),
                  (5...11),
@@ -30,7 +30,7 @@ ProgramNode(0...14)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "c"
                  )
                )]
diff --git a/test/snapshots/seattlerb/return_call_assocs.txt b/test/snapshots/seattlerb/return_call_assocs.txt
index 72edbbbfa40..9698080b5e9 100644
--- a/test/snapshots/seattlerb/return_call_assocs.txt
+++ b/test/snapshots/seattlerb/return_call_assocs.txt
@@ -123,7 +123,7 @@ ProgramNode(0...106)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "z"
                     ),
                     IntegerNode(104...105)(),
diff --git a/test/snapshots/seattlerb/safe_attrasgn.txt b/test/snapshots/seattlerb/safe_attrasgn.txt
index fabbcb5ca70..a48f189f41a 100644
--- a/test/snapshots/seattlerb/safe_attrasgn.txt
+++ b/test/snapshots/seattlerb/safe_attrasgn.txt
@@ -2,7 +2,7 @@ ProgramNode(0...8)(
   [],
   StatementsNode(0...8)(
     [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/safe_attrasgn_constant.txt b/test/snapshots/seattlerb/safe_attrasgn_constant.txt
index b8215040344..8f51d308631 100644
--- a/test/snapshots/seattlerb/safe_attrasgn_constant.txt
+++ b/test/snapshots/seattlerb/safe_attrasgn_constant.txt
@@ -2,7 +2,7 @@ ProgramNode(0...8)(
   [],
   StatementsNode(0...8)(
     [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/safe_call.txt b/test/snapshots/seattlerb/safe_call.txt
index 1621715838b..d170db0f559 100644
--- a/test/snapshots/seattlerb/safe_call.txt
+++ b/test/snapshots/seattlerb/safe_call.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/safe_call_after_newline.txt b/test/snapshots/seattlerb/safe_call_after_newline.txt
index d57c4b14f7e..0f48cd9867a 100644
--- a/test/snapshots/seattlerb/safe_call_after_newline.txt
+++ b/test/snapshots/seattlerb/safe_call_after_newline.txt
@@ -2,7 +2,7 @@ ProgramNode(0...5)(
   [],
   StatementsNode(0...5)(
     [CallNode(0...5)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (2...4),
        (4...5),
        nil,
diff --git a/test/snapshots/seattlerb/safe_call_dot_parens.txt b/test/snapshots/seattlerb/safe_call_dot_parens.txt
index 3eee73711e7..63a6f3822af 100644
--- a/test/snapshots/seattlerb/safe_call_dot_parens.txt
+++ b/test/snapshots/seattlerb/safe_call_dot_parens.txt
@@ -2,7 +2,7 @@ ProgramNode(0...5)(
   [],
   StatementsNode(0...5)(
     [CallNode(0...5)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (0...0),
        (3...4),
diff --git a/test/snapshots/seattlerb/safe_call_newline.txt b/test/snapshots/seattlerb/safe_call_newline.txt
index 1621715838b..d170db0f559 100644
--- a/test/snapshots/seattlerb/safe_call_newline.txt
+++ b/test/snapshots/seattlerb/safe_call_newline.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/safe_call_operator.txt b/test/snapshots/seattlerb/safe_call_operator.txt
index 797d9795c17..58df15db4ae 100644
--- a/test/snapshots/seattlerb/safe_call_operator.txt
+++ b/test/snapshots/seattlerb/safe_call_operator.txt
@@ -2,7 +2,7 @@ ProgramNode(0...6)(
   [],
   StatementsNode(0...6)(
     [CallNode(0...6)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/seattlerb/safe_call_rhs_newline.txt b/test/snapshots/seattlerb/safe_call_rhs_newline.txt
index 373fd185377..4000ecf59b7 100644
--- a/test/snapshots/seattlerb/safe_call_rhs_newline.txt
+++ b/test/snapshots/seattlerb/safe_call_rhs_newline.txt
@@ -5,7 +5,7 @@ ProgramNode(0...8)(
        :c,
        0,
        CallNode(4...8)(
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "a"),
+         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "a"),
          (5...7),
          (7...8),
          nil,
diff --git a/test/snapshots/seattlerb/safe_calls.txt b/test/snapshots/seattlerb/safe_calls.txt
index ef0fe5c7a84..400667a3544 100644
--- a/test/snapshots/seattlerb/safe_calls.txt
+++ b/test/snapshots/seattlerb/safe_calls.txt
@@ -3,7 +3,7 @@ ProgramNode(0...10)(
   StatementsNode(0...10)(
     [CallNode(0...10)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...3),
          (3...4),
          nil,
diff --git a/test/snapshots/seattlerb/safe_op_asgn.txt b/test/snapshots/seattlerb/safe_op_asgn.txt
index a90eecb8fdf..50e03a150c4 100644
--- a/test/snapshots/seattlerb/safe_op_asgn.txt
+++ b/test/snapshots/seattlerb/safe_op_asgn.txt
@@ -3,7 +3,7 @@ ProgramNode(0...11)(
   StatementsNode(0...11)(
     [CallOperatorWriteNode(0...11)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...3),
          (3...4),
          nil,
diff --git a/test/snapshots/seattlerb/safe_op_asgn2.txt b/test/snapshots/seattlerb/safe_op_asgn2.txt
index bf00e7947bf..2b02d02caa8 100644
--- a/test/snapshots/seattlerb/safe_op_asgn2.txt
+++ b/test/snapshots/seattlerb/safe_op_asgn2.txt
@@ -3,7 +3,7 @@ ProgramNode(0...10)(
   StatementsNode(0...10)(
     [CallOperatorOrWriteNode(0...10)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...3),
          (3...4),
          nil,
@@ -13,7 +13,7 @@ ProgramNode(0...10)(
          1,
          "b="
        ),
-       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "x"),
+       CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "x"),
        (5...8)
      )]
   )
diff --git a/test/snapshots/seattlerb/slashy_newlines_within_string.txt b/test/snapshots/seattlerb/slashy_newlines_within_string.txt
index fed889aa903..52bd599ce9b 100644
--- a/test/snapshots/seattlerb/slashy_newlines_within_string.txt
+++ b/test/snapshots/seattlerb/slashy_newlines_within_string.txt
@@ -20,12 +20,12 @@ ProgramNode(0...40)(
        "puts"
      ),
      CallNode(35...40)(
-       CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 0, "a"),
+       CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "a"),
        nil,
        (37...38),
        nil,
        ArgumentsNode(39...40)(
-         [CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 0, "b")]
+         [CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "b")]
        ),
        nil,
        nil,
diff --git a/test/snapshots/seattlerb/stabby_block_iter_call.txt b/test/snapshots/seattlerb/stabby_block_iter_call.txt
index 9d56711a762..f84e8227f95 100644
--- a/test/snapshots/seattlerb/stabby_block_iter_call.txt
+++ b/test/snapshots/seattlerb/stabby_block_iter_call.txt
@@ -21,7 +21,7 @@ ProgramNode(0...25)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "a"
                  ),
                  (12...13),
diff --git a/test/snapshots/seattlerb/str_double_double_escaped_newline.txt b/test/snapshots/seattlerb/str_double_double_escaped_newline.txt
index fa91f00d290..2be5ea34e95 100644
--- a/test/snapshots/seattlerb/str_double_double_escaped_newline.txt
+++ b/test/snapshots/seattlerb/str_double_double_escaped_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...9)(
        0,
        "a"
      ),
-     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "b")]
+     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/str_double_escaped_newline.txt b/test/snapshots/seattlerb/str_double_escaped_newline.txt
index 2ff6d74fbb3..7b724c6b80e 100644
--- a/test/snapshots/seattlerb/str_double_escaped_newline.txt
+++ b/test/snapshots/seattlerb/str_double_escaped_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...8)(
        0,
        "a"
      ),
-     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "b")]
+     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/str_double_newline.txt b/test/snapshots/seattlerb/str_double_newline.txt
index a8e003e997d..6b7a3afb325 100644
--- a/test/snapshots/seattlerb/str_double_newline.txt
+++ b/test/snapshots/seattlerb/str_double_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...7)(
        0,
        "a"
      ),
-     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b")]
+     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/str_evstr.txt b/test/snapshots/seattlerb/str_evstr.txt
index 54cd37035fd..18d41a9b6aa 100644
--- a/test/snapshots/seattlerb/str_evstr.txt
+++ b/test/snapshots/seattlerb/str_evstr.txt
@@ -7,7 +7,7 @@ ProgramNode(0...8)(
         EmbeddedStatementsNode(3...7)(
           (3...5),
           StatementsNode(5...6)(
-            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "b")]
+            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b")]
           ),
           (6...7)
         )],
diff --git a/test/snapshots/seattlerb/str_evstr_escape.txt b/test/snapshots/seattlerb/str_evstr_escape.txt
index 41b2b9e294c..e95335e2278 100644
--- a/test/snapshots/seattlerb/str_evstr_escape.txt
+++ b/test/snapshots/seattlerb/str_evstr_escape.txt
@@ -7,7 +7,7 @@ ProgramNode(0...16)(
         EmbeddedStatementsNode(3...7)(
           (3...5),
           StatementsNode(5...6)(
-            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "b")]
+            [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "b")]
           ),
           (6...7)
         ),
diff --git a/test/snapshots/seattlerb/str_heredoc_interp.txt b/test/snapshots/seattlerb/str_heredoc_interp.txt
index 3564378399f..8c0ee1e1b7d 100644
--- a/test/snapshots/seattlerb/str_heredoc_interp.txt
+++ b/test/snapshots/seattlerb/str_heredoc_interp.txt
@@ -6,7 +6,7 @@ ProgramNode(0...17)(
        [EmbeddedStatementsNode(5...9)(
           (5...7),
           StatementsNode(7...8)(
-            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "x")]
+            [CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "x")]
           ),
           (8...9)
         ),
diff --git a/test/snapshots/seattlerb/str_interp_ternary_or_label.txt b/test/snapshots/seattlerb/str_interp_ternary_or_label.txt
index d712ca00a47..d2ec64657fb 100644
--- a/test/snapshots/seattlerb/str_interp_ternary_or_label.txt
+++ b/test/snapshots/seattlerb/str_interp_ternary_or_label.txt
@@ -17,7 +17,7 @@ ProgramNode(0...23)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "a"
                  ),
                  (4...5),
@@ -45,7 +45,7 @@ ProgramNode(0...23)(
                            nil,
                            nil,
                            nil,
-                           0,
+                           2,
                            "a"
                          )]
                       ),
diff --git a/test/snapshots/seattlerb/str_pct_Q_nested.txt b/test/snapshots/seattlerb/str_pct_Q_nested.txt
index 57b00effb73..613e85a088a 100644
--- a/test/snapshots/seattlerb/str_pct_Q_nested.txt
+++ b/test/snapshots/seattlerb/str_pct_Q_nested.txt
@@ -15,7 +15,7 @@ ProgramNode(0...26)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "nest"
              )]
           ),
diff --git a/test/snapshots/seattlerb/str_single_double_escaped_newline.txt b/test/snapshots/seattlerb/str_single_double_escaped_newline.txt
index fa91f00d290..2be5ea34e95 100644
--- a/test/snapshots/seattlerb/str_single_double_escaped_newline.txt
+++ b/test/snapshots/seattlerb/str_single_double_escaped_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...9)(
        0,
        "a"
      ),
-     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "b")]
+     CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/str_single_escaped_newline.txt b/test/snapshots/seattlerb/str_single_escaped_newline.txt
index 1d2b327f6bc..d97f1ce0169 100644
--- a/test/snapshots/seattlerb/str_single_escaped_newline.txt
+++ b/test/snapshots/seattlerb/str_single_escaped_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...8)(
        0,
        "a"
      ),
-     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 0, "b")]
+     CallNode(7...8)(nil, nil, (7...8), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/str_single_newline.txt b/test/snapshots/seattlerb/str_single_newline.txt
index a8e003e997d..6b7a3afb325 100644
--- a/test/snapshots/seattlerb/str_single_newline.txt
+++ b/test/snapshots/seattlerb/str_single_newline.txt
@@ -14,6 +14,6 @@ ProgramNode(0...7)(
        0,
        "a"
      ),
-     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b")]
+     CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
   )
 )
diff --git a/test/snapshots/seattlerb/symbol_list.txt b/test/snapshots/seattlerb/symbol_list.txt
index cfd59c4e0e7..386ac609dff 100644
--- a/test/snapshots/seattlerb/symbol_list.txt
+++ b/test/snapshots/seattlerb/symbol_list.txt
@@ -7,7 +7,7 @@ ProgramNode(0...13)(
           [EmbeddedStatementsNode(3...7)(
              (3...5),
              StatementsNode(5...6)(
-               [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "a")]
+               [CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "a")]
              ),
              (6...7)
            )],
@@ -26,7 +26,7 @@ ProgramNode(0...13)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "b"
                 )]
              ),
diff --git a/test/snapshots/seattlerb/thingy.txt b/test/snapshots/seattlerb/thingy.txt
index 1a1c467f474..f12a16ed4fc 100644
--- a/test/snapshots/seattlerb/thingy.txt
+++ b/test/snapshots/seattlerb/thingy.txt
@@ -2,7 +2,7 @@ ProgramNode(0...15)(
   [],
   StatementsNode(0...15)(
     [CallNode(0...6)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "f"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "f"),
        (1...2),
        (0...0),
        (2...3),
@@ -13,7 +13,7 @@ ProgramNode(0...15)(
        "call"
      ),
      CallNode(8...15)(
-       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "f"),
+       CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "f"),
        (9...11),
        (0...0),
        (11...12),
diff --git a/test/snapshots/seattlerb/unary_minus.txt b/test/snapshots/seattlerb/unary_minus.txt
index abe6695149d..8f5ed5003ca 100644
--- a/test/snapshots/seattlerb/unary_minus.txt
+++ b/test/snapshots/seattlerb/unary_minus.txt
@@ -2,7 +2,7 @@ ProgramNode(0...2)(
   [],
   StatementsNode(0...2)(
     [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 0, "a"),
+       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
        nil,
        (0...1),
        nil,
diff --git a/test/snapshots/seattlerb/unary_plus.txt b/test/snapshots/seattlerb/unary_plus.txt
index 635c033e944..6d74a2b362c 100644
--- a/test/snapshots/seattlerb/unary_plus.txt
+++ b/test/snapshots/seattlerb/unary_plus.txt
@@ -2,7 +2,7 @@ ProgramNode(0...2)(
   [],
   StatementsNode(0...2)(
     [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 0, "a"),
+       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
        nil,
        (0...1),
        nil,
diff --git a/test/snapshots/seattlerb/unary_tilde.txt b/test/snapshots/seattlerb/unary_tilde.txt
index e73fdd577f4..8ec6e9145f4 100644
--- a/test/snapshots/seattlerb/unary_tilde.txt
+++ b/test/snapshots/seattlerb/unary_tilde.txt
@@ -2,7 +2,7 @@ ProgramNode(0...2)(
   [],
   StatementsNode(0...2)(
     [CallNode(0...2)(
-       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 0, "a"),
+       CallNode(1...2)(nil, nil, (1...2), nil, nil, nil, nil, 2, "a"),
        nil,
        (0...1),
        nil,
diff --git a/test/snapshots/seattlerb/when_splat.txt b/test/snapshots/seattlerb/when_splat.txt
index a4caedf3016..75e44cd75df 100644
--- a/test/snapshots/seattlerb/when_splat.txt
+++ b/test/snapshots/seattlerb/when_splat.txt
@@ -2,12 +2,12 @@ ProgramNode(0...25)(
   [],
   StatementsNode(0...25)(
     [CaseNode(0...25)(
-       CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 0, "a"),
+       CallNode(5...6)(nil, nil, (5...6), nil, nil, nil, nil, 2, "a"),
        [WhenNode(8...15)(
           (8...12),
           [SplatNode(13...15)(
              (13...14),
-             CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 0, "b")
+             CallNode(14...15)(nil, nil, (14...15), nil, nil, nil, nil, 2, "b")
            )],
           nil
         )],
diff --git a/test/snapshots/seattlerb/wtf_7.txt b/test/snapshots/seattlerb/wtf_7.txt
index e74a5311787..60b902f4d23 100644
--- a/test/snapshots/seattlerb/wtf_7.txt
+++ b/test/snapshots/seattlerb/wtf_7.txt
@@ -2,7 +2,7 @@ ProgramNode(0...11)(
   [],
   StatementsNode(0...11)(
     [CallNode(0...11)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...2),
        (2...3),
        nil,
@@ -18,7 +18,7 @@ ProgramNode(0...11)(
          [],
          nil,
          StatementsNode(9...10)(
-           [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "c")]
+           [CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c")]
          ),
          (8...9),
          (10...11)
diff --git a/test/snapshots/seattlerb/wtf_8.txt b/test/snapshots/seattlerb/wtf_8.txt
index 211cd9f048d..a4e4a49a3dd 100644
--- a/test/snapshots/seattlerb/wtf_8.txt
+++ b/test/snapshots/seattlerb/wtf_8.txt
@@ -2,7 +2,7 @@ ProgramNode(0...12)(
   [],
   StatementsNode(0...12)(
     [CallNode(0...12)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (11...12),
        nil,
@@ -18,7 +18,7 @@ ProgramNode(0...12)(
          [],
          nil,
          StatementsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "c")]
+           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "c")]
          ),
          (9...10),
          (11...12)
diff --git a/test/snapshots/seattlerb/yield_call_assocs.txt b/test/snapshots/seattlerb/yield_call_assocs.txt
index e6a56df147c..820afa6c08d 100644
--- a/test/snapshots/seattlerb/yield_call_assocs.txt
+++ b/test/snapshots/seattlerb/yield_call_assocs.txt
@@ -134,7 +134,7 @@ ProgramNode(0...100)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "z"
                     ),
                     IntegerNode(98...99)(),
diff --git a/test/snapshots/seattlerb/zomg_sometimes_i_hate_this_project.txt b/test/snapshots/seattlerb/zomg_sometimes_i_hate_this_project.txt
index ffc7e315da8..44a67b33775 100644
--- a/test/snapshots/seattlerb/zomg_sometimes_i_hate_this_project.txt
+++ b/test/snapshots/seattlerb/zomg_sometimes_i_hate_this_project.txt
@@ -26,7 +26,7 @@ ProgramNode(6...66)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "b"
                    ),
                    StatementsNode(32...35)(
@@ -53,7 +53,7 @@ ProgramNode(6...66)(
                           nil,
                           nil,
                           nil,
-                          0,
+                          2,
                           "d"
                         )]
                      ),
diff --git a/test/snapshots/strings.txt b/test/snapshots/strings.txt
index 9b2821a0fd3..29c9de8680e 100644
--- a/test/snapshots/strings.txt
+++ b/test/snapshots/strings.txt
@@ -39,7 +39,7 @@ ProgramNode(0...497)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bbb"
              )]
           ),
@@ -82,7 +82,7 @@ ProgramNode(0...497)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bbb"
              )]
           ),
@@ -134,7 +134,7 @@ ProgramNode(0...497)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "c"
                 )]
              ),
diff --git a/test/snapshots/symbols.txt b/test/snapshots/symbols.txt
index 6e8e1c0bb75..f53a208bcec 100644
--- a/test/snapshots/symbols.txt
+++ b/test/snapshots/symbols.txt
@@ -15,7 +15,7 @@ ProgramNode(0...345)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "var"
              )]
           ),
diff --git a/test/snapshots/ternary_operator.txt b/test/snapshots/ternary_operator.txt
index 11d64957837..0ee62bb8dfd 100644
--- a/test/snapshots/ternary_operator.txt
+++ b/test/snapshots/ternary_operator.txt
@@ -3,14 +3,14 @@ ProgramNode(0...117)(
   StatementsNode(0...117)(
     [IfNode(0...9)(
        nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        StatementsNode(4...5)(
-         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b")]
+         [CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b")]
        ),
        ElseNode(6...9)(
          (6...7),
          StatementsNode(8...9)(
-           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 0, "c")]
+           [CallNode(8...9)(nil, nil, (8...9), nil, nil, nil, nil, 2, "c")]
          ),
          nil
        ),
@@ -18,11 +18,11 @@ ProgramNode(0...117)(
      ),
      IfNode(11...38)(
        nil,
-       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 0, "a"),
+       CallNode(11...12)(nil, nil, (11...12), nil, nil, nil, nil, 2, "a"),
        StatementsNode(15...25)(
          [DefinedNode(15...25)(
             nil,
-            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 0, "b"),
+            CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "b"),
             nil,
             (15...23)
           )]
@@ -40,7 +40,7 @@ ProgramNode(0...117)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               ),
               nil,
@@ -53,7 +53,7 @@ ProgramNode(0...117)(
      ),
      IfNode(40...55)(
        nil,
-       CallNode(40...46)(nil, nil, (40...46), nil, nil, nil, nil, 0, "empty?"),
+       CallNode(40...46)(nil, nil, (40...46), nil, nil, nil, nil, 2, "empty?"),
        StatementsNode(47...51)([TrueNode(47...51)()]),
        ElseNode(51...55)(
          (51...52),
@@ -64,7 +64,7 @@ ProgramNode(0...117)(
      ),
      IfNode(57...73)(
        nil,
-       CallNode(57...63)(nil, nil, (57...63), nil, nil, nil, nil, 0, "empty?"),
+       CallNode(57...63)(nil, nil, (57...63), nil, nil, nil, nil, 2, "empty?"),
        StatementsNode(64...69)([FalseNode(64...69)()]),
        ElseNode(69...73)(
          (69...70),
@@ -75,7 +75,7 @@ ProgramNode(0...117)(
      ),
      IfNode(75...89)(
        nil,
-       CallNode(75...81)(nil, nil, (75...81), nil, nil, nil, nil, 0, "empty?"),
+       CallNode(75...81)(nil, nil, (75...81), nil, nil, nil, nil, 2, "empty?"),
        StatementsNode(82...85)([NilNode(82...85)()]),
        ElseNode(85...89)(
          (85...86),
@@ -86,7 +86,7 @@ ProgramNode(0...117)(
      ),
      IfNode(91...101)(
        nil,
-       CallNode(91...93)(nil, nil, (91...93), nil, nil, nil, nil, 0, "a?"),
+       CallNode(91...93)(nil, nil, (91...93), nil, nil, nil, nil, 2, "a?"),
        StatementsNode(94...97)([NilNode(94...97)()]),
        ElseNode(97...101)(
          (97...98),
@@ -97,7 +97,7 @@ ProgramNode(0...117)(
      ),
      IfNode(103...117)(
        nil,
-       CallNode(103...104)(nil, nil, (103...104), nil, nil, nil, nil, 0, "a"),
+       CallNode(103...104)(nil, nil, (103...104), nil, nil, nil, nil, 2, "a"),
        StatementsNode(106...110)(
          [CallNode(106...110)(
             nil,
@@ -107,7 +107,7 @@ ProgramNode(0...117)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "var1"
           )]
        ),
@@ -122,7 +122,7 @@ ProgramNode(0...117)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "var2"
             )]
          ),
diff --git a/test/snapshots/unless.txt b/test/snapshots/unless.txt
index 66d61a73073..c3c9a8117c6 100644
--- a/test/snapshots/unless.txt
+++ b/test/snapshots/unless.txt
@@ -57,7 +57,7 @@ ProgramNode(0...141)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar?"
        ),
        StatementsNode(119...129)(
diff --git a/test/snapshots/unparser/corpus/literal/assignment.txt b/test/snapshots/unparser/corpus/literal/assignment.txt
index 2083fb361b4..4a1b5eeaf76 100644
--- a/test/snapshots/unparser/corpus/literal/assignment.txt
+++ b/test/snapshots/unparser/corpus/literal/assignment.txt
@@ -419,7 +419,7 @@ ProgramNode(0...719)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "index"
             )
           ),
@@ -431,7 +431,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "value"
           )]
        ),
@@ -460,7 +460,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "value"
           )]
        ),
@@ -496,7 +496,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "value"
           )]
        ),
@@ -519,7 +519,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "index"
           ),
           CallNode(501...506)(
@@ -530,7 +530,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "value"
           )]
        ),
@@ -574,7 +574,7 @@ ProgramNode(0...719)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -605,7 +605,7 @@ ProgramNode(0...719)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar"
        ),
        (543...546)
@@ -698,7 +698,7 @@ ProgramNode(0...719)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar"
        ),
        (665...668)
diff --git a/test/snapshots/unparser/corpus/literal/block.txt b/test/snapshots/unparser/corpus/literal/block.txt
index 7d4bd2c4e6b..787c8cb5929 100644
--- a/test/snapshots/unparser/corpus/literal/block.txt
+++ b/test/snapshots/unparser/corpus/literal/block.txt
@@ -229,7 +229,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -248,7 +248,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (141...142),
@@ -287,7 +287,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -306,7 +306,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (169...170),
@@ -346,7 +346,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (189...190),
@@ -386,7 +386,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (208...209),
@@ -418,7 +418,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (229...230),
@@ -451,7 +451,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -470,7 +470,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (249...250),
@@ -507,7 +507,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -526,7 +526,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (271...272),
@@ -567,7 +567,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -586,7 +586,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (295...296),
@@ -628,7 +628,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -647,7 +647,7 @@ ProgramNode(0...737)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (322...323),
@@ -685,7 +685,7 @@ ProgramNode(0...737)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -705,7 +705,7 @@ ProgramNode(0...737)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          (347...348),
@@ -778,7 +778,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               )]
            ),
@@ -823,7 +823,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -840,7 +840,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )
               )],
@@ -855,7 +855,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "baz"
                 )]
              ),
@@ -892,7 +892,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -909,7 +909,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )
               )],
@@ -930,7 +930,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "baz"
                 )]
              ),
@@ -967,7 +967,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -983,7 +983,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )
               )],
@@ -998,7 +998,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "baz"
                 )]
              ),
@@ -1035,7 +1035,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -1078,7 +1078,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -1094,7 +1094,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "baz"
                 )]
              ),
@@ -1130,7 +1130,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -1146,7 +1146,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )
               )],
@@ -1167,7 +1167,7 @@ ProgramNode(0...737)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "baz"
                 )]
              ),
@@ -1251,7 +1251,7 @@ ProgramNode(0...737)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "_1"
               ),
               nil,
@@ -1266,7 +1266,7 @@ ProgramNode(0...737)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "_2"
                  )]
               ),
diff --git a/test/snapshots/unparser/corpus/literal/case.txt b/test/snapshots/unparser/corpus/literal/case.txt
index 3a3041c0b6c..8470bd39aaf 100644
--- a/test/snapshots/unparser/corpus/literal/case.txt
+++ b/test/snapshots/unparser/corpus/literal/case.txt
@@ -13,7 +13,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar"
            )],
           StatementsNode(16...19)(
@@ -25,7 +25,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )]
           )
@@ -40,7 +40,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "baz"
            )],
           StatementsNode(31...34)(
@@ -52,7 +52,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
@@ -62,7 +62,7 @@ ProgramNode(0...284)(
        (35...38)
      ),
      CaseNode(39...75)(
-       CallNode(44...47)(nil, nil, (44...47), nil, nil, nil, nil, 0, "foo"),
+       CallNode(44...47)(nil, nil, (44...47), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(48...56)(
           (48...52),
           [CallNode(53...56)(
@@ -73,7 +73,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar"
            )],
           nil
@@ -88,7 +88,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "baz"
            )],
           StatementsNode(68...71)(
@@ -100,7 +100,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
@@ -110,7 +110,7 @@ ProgramNode(0...284)(
        (72...75)
      ),
      CaseNode(76...118)(
-       CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 0, "foo"),
+       CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(85...99)(
           (85...89),
           [CallNode(90...93)(
@@ -121,7 +121,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar"
            )],
           StatementsNode(96...99)(
@@ -133,7 +133,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )]
           )
@@ -148,7 +148,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "baz"
            )],
           StatementsNode(111...114)(
@@ -160,7 +160,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
@@ -178,7 +178,7 @@ ProgramNode(0...284)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [WhenNode(128...150)(
@@ -191,7 +191,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar"
            ),
            CallNode(138...141)(
@@ -202,7 +202,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "baz"
            )],
           StatementsNode(144...150)(
@@ -222,7 +222,7 @@ ProgramNode(0...284)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [WhenNode(164...182)(
@@ -237,7 +237,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )
            )],
@@ -258,7 +258,7 @@ ProgramNode(0...284)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [WhenNode(196...210)(
@@ -271,7 +271,7 @@ ProgramNode(0...284)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "bar"
            )],
           StatementsNode(207...210)(
@@ -283,7 +283,7 @@ ProgramNode(0...284)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )]
           )
@@ -307,7 +307,7 @@ ProgramNode(0...284)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [WhenNode(236...251)(
@@ -323,7 +323,7 @@ ProgramNode(0...284)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                ),
                nil,
@@ -338,7 +338,7 @@ ProgramNode(0...284)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "baz"
                   )]
                ),
@@ -363,7 +363,7 @@ ProgramNode(0...284)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [WhenNode(265...280)(
@@ -379,7 +379,7 @@ ProgramNode(0...284)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                ),
                (274...275),
diff --git a/test/snapshots/unparser/corpus/literal/class.txt b/test/snapshots/unparser/corpus/literal/class.txt
index eee58beb4c7..96b50c7adf3 100644
--- a/test/snapshots/unparser/corpus/literal/class.txt
+++ b/test/snapshots/unparser/corpus/literal/class.txt
@@ -14,7 +14,7 @@ ProgramNode(0...213)(
        [],
        (13...18),
        (19...21),
-       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 0, "a"),
+       CallNode(22...23)(nil, nil, (22...23), nil, nil, nil, nil, 2, "a"),
        nil,
        (24...27)
      ),
@@ -22,9 +22,9 @@ ProgramNode(0...213)(
        [],
        (29...34),
        (35...37),
-       CallNode(38...39)(nil, nil, (38...39), nil, nil, nil, nil, 0, "a"),
+       CallNode(38...39)(nil, nil, (38...39), nil, nil, nil, nil, 2, "a"),
        StatementsNode(42...43)(
-         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 0, "b")]
+         [CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "b")]
        ),
        (44...47)
      ),
diff --git a/test/snapshots/unparser/corpus/literal/def.txt b/test/snapshots/unparser/corpus/literal/def.txt
index dab4a983c96..4a875be7619 100644
--- a/test/snapshots/unparser/corpus/literal/def.txt
+++ b/test/snapshots/unparser/corpus/literal/def.txt
@@ -8,7 +8,7 @@ ProgramNode(0...913)(
        BeginNode(10...46)(
          nil,
          StatementsNode(10...11)(
-           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 0, "a")]
+           [CallNode(10...11)(nil, nil, (10...11), nil, nil, nil, nil, 2, "a")]
          ),
          RescueNode(12...22)(
            (12...18),
@@ -24,7 +24,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "b"
               )]
            ),
@@ -41,7 +41,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -58,7 +58,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "d"
               )]
            ),
@@ -90,7 +90,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "a"
               ),
               (60...66),
@@ -102,7 +102,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "b"
               )
             )]
@@ -121,7 +121,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "b"
               )]
            ),
@@ -138,7 +138,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -155,7 +155,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "d"
               )]
            ),
@@ -219,7 +219,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -246,7 +246,7 @@ ProgramNode(0...913)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -264,7 +264,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -282,7 +282,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "baz"
               )]
            ),
@@ -313,7 +313,7 @@ ProgramNode(0...913)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -330,7 +330,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "baz"
               )]
            ),
@@ -361,7 +361,7 @@ ProgramNode(0...913)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -379,7 +379,7 @@ ProgramNode(0...913)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "baz"
               )]
            ),
@@ -485,7 +485,7 @@ ProgramNode(0...913)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "baz"
                  ),
                  NilNode(373...376)()]
@@ -603,7 +603,7 @@ ProgramNode(0...913)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )
           )],
@@ -674,7 +674,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -754,7 +754,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -792,7 +792,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -851,7 +851,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -897,7 +897,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           CallNode(796...799)(
@@ -908,7 +908,7 @@ ProgramNode(0...913)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
diff --git a/test/snapshots/unparser/corpus/literal/defs.txt b/test/snapshots/unparser/corpus/literal/defs.txt
index 94a86678dc8..b980c15c9e7 100644
--- a/test/snapshots/unparser/corpus/literal/defs.txt
+++ b/test/snapshots/unparser/corpus/literal/defs.txt
@@ -19,7 +19,7 @@ ProgramNode(0...266)(
        SelfNode(22...26)(),
        nil,
        StatementsNode(33...36)(
-         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "bar")]
        ),
        [],
        (18...21),
@@ -34,8 +34,8 @@ ProgramNode(0...266)(
        SelfNode(46...50)(),
        nil,
        StatementsNode(57...66)(
-         [CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 0, "bar"),
-          CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 0, "baz")]
+         [CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 2, "bar"),
+          CallNode(63...66)(nil, nil, (63...66), nil, nil, nil, nil, 2, "baz")]
        ),
        [],
        (42...45),
@@ -50,7 +50,7 @@ ProgramNode(0...266)(
        ConstantReadNode(76...79)(),
        nil,
        StatementsNode(86...89)(
-         [CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(86...89)(nil, nil, (86...89), nil, nil, nil, nil, 2, "bar")]
        ),
        [],
        (72...75),
@@ -106,7 +106,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -145,7 +145,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -188,7 +188,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -221,7 +221,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -246,7 +246,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
@@ -268,7 +268,7 @@ ProgramNode(0...266)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -281,7 +281,7 @@ ProgramNode(0...266)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
diff --git a/test/snapshots/unparser/corpus/literal/dstr.txt b/test/snapshots/unparser/corpus/literal/dstr.txt
index 221a8939a70..b76f9da57d1 100644
--- a/test/snapshots/unparser/corpus/literal/dstr.txt
+++ b/test/snapshots/unparser/corpus/literal/dstr.txt
@@ -26,7 +26,7 @@ ProgramNode(0...299)(
              StringNode(47...51)(nil, (47...51), nil, "a\n" + "b\n")],
             (51...61)
           ),
-          CallNode(63...64)(nil, nil, (63...64), nil, nil, nil, nil, 0, "x")]
+          CallNode(63...64)(nil, nil, (63...64), nil, nil, nil, nil, 2, "x")]
        ),
        nil,
        (65...68)
@@ -132,7 +132,7 @@ ProgramNode(0...299)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "bar"
                   )]
                ),
@@ -167,7 +167,7 @@ ProgramNode(0...299)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "bar"
                   )]
                ),
diff --git a/test/snapshots/unparser/corpus/literal/flipflop.txt b/test/snapshots/unparser/corpus/literal/flipflop.txt
index b4837b7dc83..cb04e3c4cb9 100644
--- a/test/snapshots/unparser/corpus/literal/flipflop.txt
+++ b/test/snapshots/unparser/corpus/literal/flipflop.txt
@@ -17,7 +17,7 @@ ProgramNode(0...68)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "i"
                      ),
                      nil,
@@ -44,7 +44,7 @@ ProgramNode(0...68)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "i"
                      ),
                      nil,
@@ -68,7 +68,7 @@ ProgramNode(0...68)(
          (22...23)
        ),
        StatementsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "foo")]
        ),
        nil,
        (30...33)
@@ -89,7 +89,7 @@ ProgramNode(0...68)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "i"
                      ),
                      nil,
@@ -116,7 +116,7 @@ ProgramNode(0...68)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "i"
                      ),
                      nil,
@@ -140,7 +140,7 @@ ProgramNode(0...68)(
          (57...58)
        ),
        StatementsNode(61...64)(
-         [CallNode(61...64)(nil, nil, (61...64), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(61...64)(nil, nil, (61...64), nil, nil, nil, nil, 2, "foo")]
        ),
        nil,
        (65...68)
diff --git a/test/snapshots/unparser/corpus/literal/for.txt b/test/snapshots/unparser/corpus/literal/for.txt
index 4fdb3e3d73d..1bd6587bd7a 100644
--- a/test/snapshots/unparser/corpus/literal/for.txt
+++ b/test/snapshots/unparser/corpus/literal/for.txt
@@ -23,7 +23,7 @@ ProgramNode(0...119)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             StatementsNode(22...25)(
@@ -35,7 +35,7 @@ ProgramNode(0...119)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "baz"
                )]
             ),
@@ -58,9 +58,9 @@ ProgramNode(0...119)(
          nil,
          nil
        ),
-       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 0, "bar"),
+       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "bar"),
        StatementsNode(49...52)(
-         [CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 0, "baz")]
+         [CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 2, "baz")]
        ),
        (31...34),
        (37...39),
@@ -79,9 +79,9 @@ ProgramNode(0...119)(
          (61...62),
          (67...68)
        ),
-       CallNode(72...75)(nil, nil, (72...75), nil, nil, nil, nil, 0, "bar"),
+       CallNode(72...75)(nil, nil, (72...75), nil, nil, nil, nil, 2, "bar"),
        StatementsNode(81...84)(
-         [CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 0, "baz")]
+         [CallNode(81...84)(nil, nil, (81...84), nil, nil, nil, nil, 2, "baz")]
        ),
        (57...60),
        (69...71),
@@ -105,7 +105,7 @@ ProgramNode(0...119)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar"
        ),
        StatementsNode(112...115)(
@@ -117,7 +117,7 @@ ProgramNode(0...119)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           )]
        ),
diff --git a/test/snapshots/unparser/corpus/literal/hookexe.txt b/test/snapshots/unparser/corpus/literal/hookexe.txt
index 9cd7da16bfa..b97bd65ad17 100644
--- a/test/snapshots/unparser/corpus/literal/hookexe.txt
+++ b/test/snapshots/unparser/corpus/literal/hookexe.txt
@@ -3,16 +3,16 @@ ProgramNode(0...33)(
   StatementsNode(0...33)(
     [PreExecutionNode(0...15)(
        StatementsNode(10...13)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo")]
        ),
        (0...5),
        (6...7),
        (14...15)
      ),
-     CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "bar"),
+     CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar"),
      PostExecutionNode(20...33)(
        StatementsNode(28...31)(
-         [CallNode(28...31)(nil, nil, (28...31), nil, nil, nil, nil, 0, "baz")]
+         [CallNode(28...31)(nil, nil, (28...31), nil, nil, nil, nil, 2, "baz")]
        ),
        (20...23),
        (24...25),
diff --git a/test/snapshots/unparser/corpus/literal/if.txt b/test/snapshots/unparser/corpus/literal/if.txt
index 32f5fed1ed1..8375e9acb36 100644
--- a/test/snapshots/unparser/corpus/literal/if.txt
+++ b/test/snapshots/unparser/corpus/literal/if.txt
@@ -5,7 +5,7 @@ ProgramNode(0...246)(
        (0...2),
        RegularExpressionNode(3...8)((3...4), (4...7), (7...8), "foo", 0),
        StatementsNode(11...14)(
-         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (15...18)
@@ -44,7 +44,7 @@ ProgramNode(0...246)(
      ),
      IfNode(90...100)(
        (90...92),
-       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 0, "foo"),
+       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "foo"),
        nil,
        nil,
        (97...100)
@@ -69,7 +69,7 @@ ProgramNode(0...246)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (113...116),
@@ -102,7 +102,7 @@ ProgramNode(0...246)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (146...149),
@@ -125,7 +125,7 @@ ProgramNode(0...246)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        StatementsNode(184...193)(
@@ -140,7 +140,7 @@ ProgramNode(0...246)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             (184...187),
diff --git a/test/snapshots/unparser/corpus/literal/kwbegin.txt b/test/snapshots/unparser/corpus/literal/kwbegin.txt
index b7ed53b2764..0553be37eab 100644
--- a/test/snapshots/unparser/corpus/literal/kwbegin.txt
+++ b/test/snapshots/unparser/corpus/literal/kwbegin.txt
@@ -20,7 +20,7 @@ ProgramNode(0...530)(
      BeginNode(36...49)(
        (36...41),
        StatementsNode(44...45)(
-         [CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 0, "a")]
+         [CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
@@ -30,7 +30,7 @@ ProgramNode(0...530)(
      BeginNode(51...75)(
        (51...56),
        StatementsNode(59...60)(
-         [CallNode(59...60)(nil, nil, (59...60), nil, nil, nil, nil, 0, "a")]
+         [CallNode(59...60)(nil, nil, (59...60), nil, nil, nil, nil, 2, "a")]
        ),
        RescueNode(61...71)(
          (61...67),
@@ -38,7 +38,7 @@ ProgramNode(0...530)(
          nil,
          nil,
          StatementsNode(70...71)(
-           [CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 0, "b")]
+           [CallNode(70...71)(nil, nil, (70...71), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
@@ -49,8 +49,8 @@ ProgramNode(0...530)(
      BeginNode(77...105)(
        (77...82),
        StatementsNode(85...90)(
-         [CallNode(85...86)(nil, nil, (85...86), nil, nil, nil, nil, 0, "a"),
-          CallNode(89...90)(nil, nil, (89...90), nil, nil, nil, nil, 0, "b")]
+         [CallNode(85...86)(nil, nil, (85...86), nil, nil, nil, nil, 2, "a"),
+          CallNode(89...90)(nil, nil, (89...90), nil, nil, nil, nil, 2, "b")]
        ),
        RescueNode(91...101)(
          (91...97),
@@ -66,7 +66,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -117,7 +117,7 @@ ProgramNode(0...530)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -135,7 +135,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -153,7 +153,7 @@ ProgramNode(0...530)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -172,7 +172,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
@@ -195,7 +195,7 @@ ProgramNode(0...530)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
@@ -219,7 +219,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             CallNode(266...269)(
@@ -230,7 +230,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -267,7 +267,7 @@ ProgramNode(0...530)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (307...310),
@@ -348,7 +348,7 @@ ProgramNode(0...530)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
diff --git a/test/snapshots/unparser/corpus/literal/literal.txt b/test/snapshots/unparser/corpus/literal/literal.txt
index e98de431b68..71811a07a92 100644
--- a/test/snapshots/unparser/corpus/literal/literal.txt
+++ b/test/snapshots/unparser/corpus/literal/literal.txt
@@ -119,7 +119,7 @@ ProgramNode(0...916)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           ),
           (160...162)
@@ -142,7 +142,7 @@ ProgramNode(0...916)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "baz"
           ),
           (198...200)
@@ -230,7 +230,7 @@ ProgramNode(0...916)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )]
           ),
@@ -396,7 +396,7 @@ ProgramNode(0...916)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           ),
@@ -515,7 +515,7 @@ ProgramNode(0...916)(
           nil,
           nil,
           nil,
-          0,
+          2,
           "n2"
         )],
        (673...674),
@@ -607,7 +607,7 @@ ProgramNode(0...916)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "foo"
                  )
                )]
@@ -722,7 +722,7 @@ ProgramNode(0...916)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              )]
           ),
diff --git a/test/snapshots/unparser/corpus/literal/opasgn.txt b/test/snapshots/unparser/corpus/literal/opasgn.txt
index df1836e4c57..04f547fc9ef 100644
--- a/test/snapshots/unparser/corpus/literal/opasgn.txt
+++ b/test/snapshots/unparser/corpus/literal/opasgn.txt
@@ -39,7 +39,7 @@ ProgramNode(0...233)(
      LocalVariableOperatorAndWriteNode(36...43)(
        (36...37),
        (38...41),
-       CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 0, "b"),
+       CallNode(42...43)(nil, nil, (42...43), nil, nil, nil, nil, 2, "b"),
        :a
      ),
      LocalVariableOperatorOrWriteNode(44...51)(
@@ -87,8 +87,8 @@ ProgramNode(0...233)(
        (76...79),
        (76...77),
        ArgumentsNode(77...83)(
-         [CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 0, "k"),
-          CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 0, "v")]
+         [CallNode(77...78)(nil, nil, (77...78), nil, nil, nil, nil, 2, "k"),
+          CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "v")]
        ),
        (78...79),
        nil,
@@ -188,7 +188,7 @@ ProgramNode(0...233)(
          "b="
        ),
        (134...137),
-       CallNode(138...139)(nil, nil, (138...139), nil, nil, nil, nil, 0, "b")
+       CallNode(138...139)(nil, nil, (138...139), nil, nil, nil, nil, 2, "b")
      ),
      CallOperatorOrWriteNode(140...149)(
        CallNode(140...143)(
@@ -220,7 +220,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -248,7 +248,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -276,7 +276,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -304,7 +304,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -332,7 +332,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -360,7 +360,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -370,7 +370,7 @@ ProgramNode(0...233)(
          "[]="
        ),
        (206...209),
-       CallNode(210...211)(nil, nil, (210...211), nil, nil, nil, nil, 0, "b")
+       CallNode(210...211)(nil, nil, (210...211), nil, nil, nil, nil, 2, "b")
      ),
      CallOperatorOrWriteNode(212...222)(
        CallNode(212...216)(
@@ -387,7 +387,7 @@ ProgramNode(0...233)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -409,7 +409,7 @@ ProgramNode(0...233)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          (226...227),
diff --git a/test/snapshots/unparser/corpus/literal/pattern.txt b/test/snapshots/unparser/corpus/literal/pattern.txt
index cc8b9242d63..9488cc78502 100644
--- a/test/snapshots/unparser/corpus/literal/pattern.txt
+++ b/test/snapshots/unparser/corpus/literal/pattern.txt
@@ -2,7 +2,7 @@ ProgramNode(0...408)(
   [:a, :x, :y],
   StatementsNode(0...408)(
     [CaseNode(0...345)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [InNode(9...38)(
           ArrayPatternNode(12...26)(
             ConstantReadNode(12...13)(),
@@ -37,7 +37,7 @@ ProgramNode(0...408)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "y"
              )]
           ),
@@ -230,7 +230,7 @@ ProgramNode(0...408)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(355...372)(
@@ -262,7 +262,7 @@ ProgramNode(0...408)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        [InNode(386...390)(
diff --git a/test/snapshots/unparser/corpus/literal/pragma.txt b/test/snapshots/unparser/corpus/literal/pragma.txt
index 26e9f4c56d2..86c13274335 100644
--- a/test/snapshots/unparser/corpus/literal/pragma.txt
+++ b/test/snapshots/unparser/corpus/literal/pragma.txt
@@ -4,6 +4,6 @@ ProgramNode(0...38)(
     [SourceEncodingNode(0...12)(),
      SourceFileNode(13...21)("unparser/corpus/literal/pragma.txt"),
      SourceLineNode(22...30)(),
-     CallNode(31...38)(nil, nil, (31...38), nil, nil, nil, nil, 0, "__dir__")]
+     CallNode(31...38)(nil, nil, (31...38), nil, nil, nil, nil, 2, "__dir__")]
   )
 )
diff --git a/test/snapshots/unparser/corpus/literal/rescue.txt b/test/snapshots/unparser/corpus/literal/rescue.txt
index f0018fbfad5..ed653b5d136 100644
--- a/test/snapshots/unparser/corpus/literal/rescue.txt
+++ b/test/snapshots/unparser/corpus/literal/rescue.txt
@@ -2,12 +2,12 @@ ProgramNode(0...64)(
   [:x],
   StatementsNode(0...64)(
     [RescueModifierNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (4...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "bar")
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "bar")
      ),
      RescueModifierNode(15...36)(
-       CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 0, "foo"),
+       CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "foo"),
        (19...25),
        ReturnNode(26...36)(
          (26...32),
@@ -20,7 +20,7 @@ ProgramNode(0...64)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          )
@@ -40,7 +40,7 @@ ProgramNode(0...64)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               ),
               (46...52),
@@ -55,7 +55,7 @@ ProgramNode(0...64)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "bar"
                    )]
                 )
diff --git a/test/snapshots/unparser/corpus/literal/send.txt b/test/snapshots/unparser/corpus/literal/send.txt
index a91a3239142..303d7ec29e6 100644
--- a/test/snapshots/unparser/corpus/literal/send.txt
+++ b/test/snapshots/unparser/corpus/literal/send.txt
@@ -35,7 +35,7 @@ ProgramNode(0...991)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "b"
                    ),
                    (20...21),
@@ -162,7 +162,7 @@ ProgramNode(0...991)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )],
             nil
@@ -190,7 +190,7 @@ ProgramNode(0...991)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          [WhenNode(179...187)(
@@ -203,7 +203,7 @@ ProgramNode(0...991)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )],
             nil
@@ -296,7 +296,7 @@ ProgramNode(0...991)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil
@@ -321,7 +321,7 @@ ProgramNode(0...991)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil
@@ -367,7 +367,7 @@ ProgramNode(0...991)(
            nil,
            nil,
            nil,
-           0,
+           2,
            "foo"
          ),
          nil,
@@ -452,7 +452,7 @@ ProgramNode(0...991)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               ),
               nil,
@@ -524,7 +524,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           )]
        ),
@@ -572,7 +572,7 @@ ProgramNode(0...991)(
        "FOO"
      ),
      CallNode(417...421)(
-       CallNode(417...418)(nil, nil, (417...418), nil, nil, nil, nil, 0, "a"),
+       CallNode(417...418)(nil, nil, (417...418), nil, nil, nil, nil, 2, "a"),
        (418...420),
        (420...421),
        nil,
@@ -583,7 +583,7 @@ ProgramNode(0...991)(
        "b"
      ),
      CallNode(422...427)(
-       CallNode(422...423)(nil, nil, (422...423), nil, nil, nil, nil, 0, "a"),
+       CallNode(422...423)(nil, nil, (422...423), nil, nil, nil, nil, 2, "a"),
        (423...424),
        (424...427),
        nil,
@@ -593,7 +593,7 @@ ProgramNode(0...991)(
        0,
        "foo"
      ),
-     CallNode(428...431)(nil, nil, (428...431), nil, nil, nil, nil, 0, "foo"),
+     CallNode(428...431)(nil, nil, (428...431), nil, nil, nil, nil, 2, "foo"),
      CallNode(432...450)(
        CallNode(432...435)(
          nil,
@@ -603,7 +603,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -621,7 +621,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  nil,
@@ -636,7 +636,7 @@ ProgramNode(0...991)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "baz"
                     )]
                  ),
@@ -664,7 +664,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -702,7 +702,7 @@ ProgramNode(0...991)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "foo"
                    ),
                    CallNode(477...480)(
@@ -713,7 +713,7 @@ ProgramNode(0...991)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "bar"
                    ),
                    (474...476)
@@ -745,7 +745,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (487...488)
@@ -772,7 +772,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           ),
@@ -785,7 +785,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (506...507)
@@ -812,7 +812,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "arguments"
             )
           )]
@@ -849,7 +849,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -872,7 +872,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           ),
           SplatNode(558...563)(
@@ -885,7 +885,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           )]
@@ -910,7 +910,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             ),
             nil,
@@ -945,7 +945,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (586...587),
@@ -961,7 +961,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (591...592)
@@ -981,7 +981,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (600...601),
@@ -998,7 +998,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "arga"
             )
           ),
@@ -1010,7 +1010,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           SplatNode(617...622)(
@@ -1023,7 +1023,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "argb"
             )
           )]
@@ -1042,7 +1042,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (627...628),
@@ -1059,7 +1059,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           )]
@@ -1078,7 +1078,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (642...643),
@@ -1095,7 +1095,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           ),
@@ -1107,7 +1107,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           )]
        ),
@@ -1125,7 +1125,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (662...663),
@@ -1142,7 +1142,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (673...674)
@@ -1162,7 +1162,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (682...683),
@@ -1180,7 +1180,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "boz"
                ),
                nil
@@ -1201,7 +1201,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (700...701),
@@ -1216,7 +1216,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           KeywordHashNode(710...722)(
@@ -1235,7 +1235,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "boz"
                ),
                (716...718)
@@ -1256,7 +1256,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (727...728),
@@ -1271,7 +1271,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           SplatNode(737...742)(
@@ -1284,7 +1284,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           )]
@@ -1303,7 +1303,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (747...748),
@@ -1318,7 +1318,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           SplatNode(757...762)(
@@ -1331,7 +1331,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "args"
             )
           ),
@@ -1344,7 +1344,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (764...765)
@@ -1364,7 +1364,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (775...776),
@@ -1379,7 +1379,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           ),
           HashNode(785...787)((785...786), [], (786...787))]
@@ -1398,7 +1398,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (792...793),
@@ -1417,7 +1417,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "boz"
                ),
                nil
@@ -1432,7 +1432,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "boz"
           )]
        ),
@@ -1450,7 +1450,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (819...820),
@@ -1481,7 +1481,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "b"
                ),
                nil
@@ -1502,7 +1502,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (842...843),
@@ -1520,7 +1520,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "b"
                ),
                nil
@@ -1541,7 +1541,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (854...855),
@@ -1558,7 +1558,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "a"
                ),
                (857...859)
@@ -1579,7 +1579,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -1596,7 +1596,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )
           )]
@@ -1615,7 +1615,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -1638,7 +1638,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -1686,7 +1686,7 @@ ProgramNode(0...991)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "a"
               ),
               nil,
@@ -1701,7 +1701,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "b"
                  )]
               ),
@@ -1729,7 +1729,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "c"
                  ),
                  nil,
@@ -1744,7 +1744,7 @@ ProgramNode(0...991)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -1775,7 +1775,7 @@ ProgramNode(0...991)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "a"
               ),
               nil,
@@ -1790,7 +1790,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "b"
                  )]
               ),
@@ -1816,7 +1816,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "c"
             ),
             (940...941),
@@ -1831,7 +1831,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "e"
                ),
                CallNode(946...947)(
@@ -1842,7 +1842,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "f"
                )]
             ),
@@ -1869,7 +1869,7 @@ ProgramNode(0...991)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "a"
               ),
               nil,
@@ -1884,7 +1884,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "b"
                  )]
               ),
@@ -1910,7 +1910,7 @@ ProgramNode(0...991)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "c"
             ),
             (960...961),
@@ -1927,7 +1927,7 @@ ProgramNode(0...991)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "f"
                  )
                )]
@@ -1959,7 +1959,7 @@ ProgramNode(0...991)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                ),
                (969...971)
@@ -1980,7 +1980,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (979...981),
@@ -2001,7 +2001,7 @@ ProgramNode(0...991)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        (986...987),
@@ -2016,7 +2016,7 @@ ProgramNode(0...991)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "b"
           )]
        ),
diff --git a/test/snapshots/unparser/corpus/literal/since/27.txt b/test/snapshots/unparser/corpus/literal/since/27.txt
index 0f2e6cc90ca..cccfbc64b47 100644
--- a/test/snapshots/unparser/corpus/literal/since/27.txt
+++ b/test/snapshots/unparser/corpus/literal/since/27.txt
@@ -7,7 +7,7 @@ ProgramNode(0...22)(
        nil,
        StatementsNode(7...14)(
          [CallNode(7...14)(
-            CallNode(7...9)(nil, nil, (7...9), nil, nil, nil, nil, 0, "_1"),
+            CallNode(7...9)(nil, nil, (7...9), nil, nil, nil, nil, 2, "_1"),
             nil,
             (10...11),
             nil,
@@ -20,7 +20,7 @@ ProgramNode(0...22)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "_2"
                )]
             ),
diff --git a/test/snapshots/unparser/corpus/literal/super.txt b/test/snapshots/unparser/corpus/literal/super.txt
index 6a06faa9cfa..191e0a5b918 100644
--- a/test/snapshots/unparser/corpus/literal/super.txt
+++ b/test/snapshots/unparser/corpus/literal/super.txt
@@ -7,7 +7,7 @@ ProgramNode(0...159)(
        (14...19),
        (19...20),
        ArgumentsNode(20...21)(
-         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 0, "a")]
+         [CallNode(20...21)(nil, nil, (20...21), nil, nil, nil, nil, 2, "a")]
        ),
        (21...22),
        nil
@@ -16,8 +16,8 @@ ProgramNode(0...159)(
        (23...28),
        (28...29),
        ArgumentsNode(29...33)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 0, "a"),
-          CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 0, "b")]
+         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a"),
+          CallNode(32...33)(nil, nil, (32...33), nil, nil, nil, nil, 2, "b")]
        ),
        (33...34),
        nil
@@ -35,7 +35,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (41...42)
@@ -48,7 +48,7 @@ ProgramNode(0...159)(
        (49...54),
        (54...55),
        ArgumentsNode(55...64)(
-         [CallNode(55...56)(nil, nil, (55...56), nil, nil, nil, nil, 0, "a"),
+         [CallNode(55...56)(nil, nil, (55...56), nil, nil, nil, nil, 2, "a"),
           BlockArgumentNode(58...64)(
             CallNode(59...64)(
               nil,
@@ -58,7 +58,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "block"
             ),
             (58...59)
@@ -90,7 +90,7 @@ ProgramNode(0...159)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "foo"
                  )]
               ),
@@ -117,7 +117,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -137,7 +137,7 @@ ProgramNode(0...159)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -154,7 +154,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -179,7 +179,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -199,7 +199,7 @@ ProgramNode(0...159)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           ),
           CallNode(147...148)(
@@ -210,7 +210,7 @@ ProgramNode(0...159)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "b"
           )]
        ),
@@ -227,7 +227,7 @@ ProgramNode(0...159)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
diff --git a/test/snapshots/unparser/corpus/literal/unary.txt b/test/snapshots/unparser/corpus/literal/unary.txt
index ac413537706..d4279a42221 100644
--- a/test/snapshots/unparser/corpus/literal/unary.txt
+++ b/test/snapshots/unparser/corpus/literal/unary.txt
@@ -54,7 +54,7 @@ ProgramNode(0...54)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "foo"
                      ),
                      CallNode(20...23)(
@@ -65,7 +65,7 @@ ProgramNode(0...54)(
                        nil,
                        nil,
                        nil,
-                       0,
+                       2,
                        "bar"
                      ),
                      (17...19)
@@ -134,7 +134,7 @@ ProgramNode(0...54)(
        "!"
      ),
      CallNode(36...38)(
-       CallNode(37...38)(nil, nil, (37...38), nil, nil, nil, nil, 0, "a"),
+       CallNode(37...38)(nil, nil, (37...38), nil, nil, nil, nil, 2, "a"),
        nil,
        (36...37),
        nil,
@@ -145,7 +145,7 @@ ProgramNode(0...54)(
        "~"
      ),
      CallNode(39...41)(
-       CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 0, "a"),
+       CallNode(40...41)(nil, nil, (40...41), nil, nil, nil, nil, 2, "a"),
        nil,
        (39...40),
        nil,
@@ -156,7 +156,7 @@ ProgramNode(0...54)(
        "-@"
      ),
      CallNode(42...44)(
-       CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 0, "a"),
+       CallNode(43...44)(nil, nil, (43...44), nil, nil, nil, nil, 2, "a"),
        nil,
        (42...43),
        nil,
@@ -179,7 +179,7 @@ ProgramNode(0...54)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "a"
                 ),
                 nil,
diff --git a/test/snapshots/unparser/corpus/literal/variables.txt b/test/snapshots/unparser/corpus/literal/variables.txt
index 1cf71a2360d..b7ab14e36c3 100644
--- a/test/snapshots/unparser/corpus/literal/variables.txt
+++ b/test/snapshots/unparser/corpus/literal/variables.txt
@@ -1,7 +1,7 @@
 ProgramNode(0...66)(
   [],
   StatementsNode(0...66)(
-    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+    [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
      InstanceVariableReadNode(2...4)(),
      ClassVariableReadNode(5...8)(),
      GlobalVariableReadNode(9...11)(),
diff --git a/test/snapshots/unparser/corpus/literal/while.txt b/test/snapshots/unparser/corpus/literal/while.txt
index a08e9696dd1..1560edb57bc 100644
--- a/test/snapshots/unparser/corpus/literal/while.txt
+++ b/test/snapshots/unparser/corpus/literal/while.txt
@@ -40,7 +40,7 @@ ProgramNode(0...620)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "foo"
                    ),
                    StatementsNode(43...52)(
@@ -84,7 +84,7 @@ ProgramNode(0...620)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "baz"
                  )]
               ),
@@ -105,7 +105,7 @@ ProgramNode(0...620)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (80...83),
@@ -142,7 +142,7 @@ ProgramNode(0...620)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (123...126),
@@ -173,7 +173,7 @@ ProgramNode(0...620)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (159...162),
@@ -199,7 +199,7 @@ ProgramNode(0...620)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             ),
             StatementsNode(209...218)(
@@ -214,7 +214,7 @@ ProgramNode(0...620)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (209...212),
@@ -264,7 +264,7 @@ ProgramNode(0...620)(
                      nil,
                      nil,
                      nil,
-                     0,
+                     2,
                      "foo"
                    ),
                    StatementsNode(274...283)(
@@ -279,7 +279,7 @@ ProgramNode(0...620)(
                           nil,
                           nil,
                           nil,
-                          0,
+                          2,
                           "bar"
                         ),
                         (274...277),
@@ -341,7 +341,7 @@ ProgramNode(0...620)(
                           nil,
                           nil,
                           nil,
-                          0,
+                          2,
                           "bar"
                         ),
                         (345...348),
@@ -374,7 +374,7 @@ ProgramNode(0...620)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "baz"
               ),
               StatementsNode(376...391)(
@@ -389,7 +389,7 @@ ProgramNode(0...620)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "foo"
                       )]
                    ),
@@ -417,7 +417,7 @@ ProgramNode(0...620)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "baz"
        ),
        StatementsNode(403...418)(
@@ -432,7 +432,7 @@ ProgramNode(0...620)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
@@ -453,7 +453,7 @@ ProgramNode(0...620)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "baz"
        ),
        StatementsNode(429...450)(
@@ -468,7 +468,7 @@ ProgramNode(0...620)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                ),
                CallNode(443...446)(
@@ -479,7 +479,7 @@ ProgramNode(0...620)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
@@ -500,7 +500,7 @@ ProgramNode(0...620)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "baz"
        ),
        StatementsNode(461...482)(
@@ -515,7 +515,7 @@ ProgramNode(0...620)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                ),
                CallNode(475...478)(
@@ -526,7 +526,7 @@ ProgramNode(0...620)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
diff --git a/test/snapshots/unparser/corpus/literal/yield.txt b/test/snapshots/unparser/corpus/literal/yield.txt
index 224659ffb17..4ccd79e2dd1 100644
--- a/test/snapshots/unparser/corpus/literal/yield.txt
+++ b/test/snapshots/unparser/corpus/literal/yield.txt
@@ -6,7 +6,7 @@ ProgramNode(0...26)(
        (6...11),
        (11...12),
        ArgumentsNode(12...13)(
-         [CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 0, "a")]
+         [CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "a")]
        ),
        (13...14)
      ),
@@ -14,8 +14,8 @@ ProgramNode(0...26)(
        (15...20),
        (20...21),
        ArgumentsNode(21...25)(
-         [CallNode(21...22)(nil, nil, (21...22), nil, nil, nil, nil, 0, "a"),
-          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 0, "b")]
+         [CallNode(21...22)(nil, nil, (21...22), nil, nil, nil, nil, 2, "a"),
+          CallNode(24...25)(nil, nil, (24...25), nil, nil, nil, nil, 2, "b")]
        ),
        (25...26)
      )]
diff --git a/test/snapshots/unparser/corpus/semantic/and.txt b/test/snapshots/unparser/corpus/semantic/and.txt
index 470615af51c..b914a05d7b5 100644
--- a/test/snapshots/unparser/corpus/semantic/and.txt
+++ b/test/snapshots/unparser/corpus/semantic/and.txt
@@ -3,14 +3,14 @@ ProgramNode(0...77)(
   StatementsNode(0...77)(
     [OrNode(0...14)(
        RangeNode(0...5)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
-         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
+         CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
          (1...4),
          1
        ),
        RangeNode(9...14)(
-         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 0, "c"),
-         CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 0, "d"),
+         CallNode(9...10)(nil, nil, (9...10), nil, nil, nil, nil, 2, "c"),
+         CallNode(13...14)(nil, nil, (13...14), nil, nil, nil, nil, 2, "d"),
          (10...13),
          1
        ),
@@ -18,14 +18,14 @@ ProgramNode(0...77)(
      ),
      AndNode(15...30)(
        RangeNode(15...20)(
-         CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 0, "a"),
-         CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 0, "b"),
+         CallNode(15...16)(nil, nil, (15...16), nil, nil, nil, nil, 2, "a"),
+         CallNode(19...20)(nil, nil, (19...20), nil, nil, nil, nil, 2, "b"),
          (16...19),
          1
        ),
        RangeNode(25...30)(
-         CallNode(25...26)(nil, nil, (25...26), nil, nil, nil, nil, 0, "c"),
-         CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 0, "d"),
+         CallNode(25...26)(nil, nil, (25...26), nil, nil, nil, nil, 2, "c"),
+         CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "d"),
          (26...29),
          1
        ),
@@ -35,14 +35,14 @@ ProgramNode(0...77)(
        (32...34),
        OrNode(35...49)(
          RangeNode(35...40)(
-           CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 0, "a"),
-           CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 0, "b"),
+           CallNode(35...36)(nil, nil, (35...36), nil, nil, nil, nil, 2, "a"),
+           CallNode(39...40)(nil, nil, (39...40), nil, nil, nil, nil, 2, "b"),
            (36...39),
            1
          ),
          RangeNode(44...49)(
-           CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 0, "c"),
-           CallNode(48...49)(nil, nil, (48...49), nil, nil, nil, nil, 0, "d"),
+           CallNode(44...45)(nil, nil, (44...45), nil, nil, nil, nil, 2, "c"),
+           CallNode(48...49)(nil, nil, (48...49), nil, nil, nil, nil, 2, "d"),
            (45...48),
            1
          ),
@@ -56,14 +56,14 @@ ProgramNode(0...77)(
        (55...57),
        AndNode(58...73)(
          RangeNode(58...63)(
-           CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 0, "a"),
-           CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 0, "b"),
+           CallNode(58...59)(nil, nil, (58...59), nil, nil, nil, nil, 2, "a"),
+           CallNode(62...63)(nil, nil, (62...63), nil, nil, nil, nil, 2, "b"),
            (59...62),
            1
          ),
          RangeNode(68...73)(
-           CallNode(68...69)(nil, nil, (68...69), nil, nil, nil, nil, 0, "c"),
-           CallNode(72...73)(nil, nil, (72...73), nil, nil, nil, nil, 0, "d"),
+           CallNode(68...69)(nil, nil, (68...69), nil, nil, nil, nil, 2, "c"),
+           CallNode(72...73)(nil, nil, (72...73), nil, nil, nil, nil, 2, "d"),
            (69...72),
            1
          ),
diff --git a/test/snapshots/unparser/corpus/semantic/block.txt b/test/snapshots/unparser/corpus/semantic/block.txt
index c4b2d1ab4ce..4e8eb82fe07 100644
--- a/test/snapshots/unparser/corpus/semantic/block.txt
+++ b/test/snapshots/unparser/corpus/semantic/block.txt
@@ -151,7 +151,7 @@ ProgramNode(0...148)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "a"
             )]
          ),
diff --git a/test/snapshots/unparser/corpus/semantic/def.txt b/test/snapshots/unparser/corpus/semantic/def.txt
index 922dbc5a455..439ffafe1be 100644
--- a/test/snapshots/unparser/corpus/semantic/def.txt
+++ b/test/snapshots/unparser/corpus/semantic/def.txt
@@ -17,7 +17,7 @@ ProgramNode(0...55)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "a"
                  ),
                  nil,
@@ -32,7 +32,7 @@ ProgramNode(0...55)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "b"
                     )]
                  ),
@@ -60,7 +60,7 @@ ProgramNode(0...55)(
        nil,
        StatementsNode(33...51)(
          [RescueModifierNode(33...51)(
-            CallNode(33...34)(nil, nil, (33...34), nil, nil, nil, nil, 0, "a"),
+            CallNode(33...34)(nil, nil, (33...34), nil, nil, nil, nil, 2, "a"),
             (35...41),
             ConstantReadNode(42...51)()
           )]
diff --git a/test/snapshots/unparser/corpus/semantic/kwbegin.txt b/test/snapshots/unparser/corpus/semantic/kwbegin.txt
index b0ea59e21da..5ae3acede61 100644
--- a/test/snapshots/unparser/corpus/semantic/kwbegin.txt
+++ b/test/snapshots/unparser/corpus/semantic/kwbegin.txt
@@ -20,7 +20,7 @@ ProgramNode(0...215)(
      BeginNode(41...54)(
        (41...46),
        StatementsNode(49...50)(
-         [CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 0, "a")]
+         [CallNode(49...50)(nil, nil, (49...50), nil, nil, nil, nil, 2, "a")]
        ),
        nil,
        nil,
@@ -30,7 +30,7 @@ ProgramNode(0...215)(
      BeginNode(56...80)(
        (56...61),
        StatementsNode(64...65)(
-         [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 0, "a")]
+         [CallNode(64...65)(nil, nil, (64...65), nil, nil, nil, nil, 2, "a")]
        ),
        RescueNode(66...76)(
          (66...72),
@@ -38,7 +38,7 @@ ProgramNode(0...215)(
          nil,
          nil,
          StatementsNode(75...76)(
-           [CallNode(75...76)(nil, nil, (75...76), nil, nil, nil, nil, 0, "b")]
+           [CallNode(75...76)(nil, nil, (75...76), nil, nil, nil, nil, 2, "b")]
          ),
          nil
        ),
@@ -49,8 +49,8 @@ ProgramNode(0...215)(
      BeginNode(82...110)(
        (82...87),
        StatementsNode(90...95)(
-         [CallNode(90...91)(nil, nil, (90...91), nil, nil, nil, nil, 0, "a"),
-          CallNode(94...95)(nil, nil, (94...95), nil, nil, nil, nil, 0, "b")]
+         [CallNode(90...91)(nil, nil, (90...91), nil, nil, nil, nil, 2, "a"),
+          CallNode(94...95)(nil, nil, (94...95), nil, nil, nil, nil, 2, "b")]
        ),
        RescueNode(96...106)(
          (96...102),
@@ -66,7 +66,7 @@ ProgramNode(0...215)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -117,7 +117,7 @@ ProgramNode(0...215)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           )]
        ),
@@ -135,7 +135,7 @@ ProgramNode(0...215)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "b"
             )]
          ),
@@ -153,7 +153,7 @@ ProgramNode(0...215)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -172,7 +172,7 @@ ProgramNode(0...215)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "d"
             )]
          ),
diff --git a/test/snapshots/unparser/corpus/semantic/literal.txt b/test/snapshots/unparser/corpus/semantic/literal.txt
index 30225ed2ca0..b6ac4e83630 100644
--- a/test/snapshots/unparser/corpus/semantic/literal.txt
+++ b/test/snapshots/unparser/corpus/semantic/literal.txt
@@ -74,7 +74,7 @@ ProgramNode(0...131)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
diff --git a/test/snapshots/unparser/corpus/semantic/send.txt b/test/snapshots/unparser/corpus/semantic/send.txt
index 4f2c294e9e5..b584fa06cf9 100644
--- a/test/snapshots/unparser/corpus/semantic/send.txt
+++ b/test/snapshots/unparser/corpus/semantic/send.txt
@@ -1,7 +1,7 @@
 ProgramNode(0...44)(
   [],
   StatementsNode(0...44)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
      CallNode(4...10)(
        nil,
        nil,
@@ -16,7 +16,7 @@ ProgramNode(0...44)(
      CallNode(12...27)(
        CallNode(12...22)(
          CallNode(12...20)(
-           CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 0, "a"),
+           CallNode(12...13)(nil, nil, (12...13), nil, nil, nil, nil, 2, "a"),
            (13...14),
            (14...17),
            (17...18),
@@ -29,7 +29,7 @@ ProgramNode(0...44)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "b"
               )]
            ),
@@ -51,7 +51,7 @@ ProgramNode(0...44)(
        (23...25),
        nil,
        ArgumentsNode(26...27)(
-         [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 0, "d")]
+         [CallNode(26...27)(nil, nil, (26...27), nil, nil, nil, nil, 2, "d")]
        ),
        nil,
        nil,
@@ -59,7 +59,7 @@ ProgramNode(0...44)(
        "=="
      ),
      CallNode(29...44)(
-       CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 0, "a"),
+       CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a"),
        nil,
        (31...33),
        nil,
@@ -74,7 +74,7 @@ ProgramNode(0...44)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "d"
               ),
               (35...36),
@@ -98,7 +98,7 @@ ProgramNode(0...44)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "c"
                )]
             ),
diff --git a/test/snapshots/unparser/corpus/semantic/while.txt b/test/snapshots/unparser/corpus/semantic/while.txt
index f608e21cfb2..937f44a6136 100644
--- a/test/snapshots/unparser/corpus/semantic/while.txt
+++ b/test/snapshots/unparser/corpus/semantic/while.txt
@@ -15,7 +15,7 @@ ProgramNode(0...188)(
          "b?"
        ),
        StatementsNode(0...1)(
-         [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a")]
+         [CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a")]
        )
      ),
      UntilNode(15...34)(
@@ -32,7 +32,7 @@ ProgramNode(0...188)(
          "b?"
        ),
        StatementsNode(29...30)(
-         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 0, "a")]
+         [CallNode(29...30)(nil, nil, (29...30), nil, nil, nil, nil, 2, "a")]
        )
      ),
      WhileNode(36...55)(
@@ -50,7 +50,7 @@ ProgramNode(0...188)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             ),
             (36...39),
@@ -61,7 +61,7 @@ ProgramNode(0...188)(
      UntilNode(57...75)(
        (59...64),
        AndNode(65...75)(
-         CallNode(65...66)(nil, nil, (65...66), nil, nil, nil, nil, 0, "b"),
+         CallNode(65...66)(nil, nil, (65...66), nil, nil, nil, nil, 2, "b"),
          CallNode(70...75)(
            nil,
            nil,
@@ -76,7 +76,7 @@ ProgramNode(0...188)(
          (67...69)
        ),
        StatementsNode(57...58)(
-         [CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 0, "a")]
+         [CallNode(57...58)(nil, nil, (57...58), nil, nil, nil, nil, 2, "a")]
        )
      ),
      WhileNode(77...96)(
@@ -84,7 +84,7 @@ ProgramNode(0...188)(
        LocalVariableWriteNode(83...88)(
          :a,
          0,
-         CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 0, "b"),
+         CallNode(87...88)(nil, nil, (87...88), nil, nil, nil, nil, 2, "b"),
          (83...84),
          (85...86)
        ),
@@ -113,7 +113,7 @@ ProgramNode(0...188)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "c"
               )]
            ),
@@ -141,7 +141,7 @@ ProgramNode(0...188)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "exp"
             ),
             (143...146),
@@ -162,7 +162,7 @@ ProgramNode(0...188)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "bar"
                  ),
                  (169...172),
diff --git a/test/snapshots/until.txt b/test/snapshots/until.txt
index c9ae1f6fbdf..9d6899e8f0c 100644
--- a/test/snapshots/until.txt
+++ b/test/snapshots/until.txt
@@ -36,7 +36,7 @@ ProgramNode(0...109)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar?"
        ),
        StatementsNode(88...98)(
diff --git a/test/snapshots/variables.txt b/test/snapshots/variables.txt
index 73645e4e52f..30e31c8b777 100644
--- a/test/snapshots/variables.txt
+++ b/test/snapshots/variables.txt
@@ -36,7 +36,7 @@ ProgramNode(0...293)(
        IntegerNode(79...80)(),
        (77...78)
      ),
-     CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 0, "a"),
+     CallNode(82...83)(nil, nil, (82...83), nil, nil, nil, nil, 2, "a"),
      LocalVariableWriteNode(85...92)(
        :abc,
        0,
@@ -199,7 +199,7 @@ ProgramNode(0...293)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "a"
           ),
           CallNode(288...289)(
@@ -210,7 +210,7 @@ ProgramNode(0...293)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "b"
           ),
           CallNode(291...292)(
@@ -221,7 +221,7 @@ ProgramNode(0...293)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "c"
           )]
        ),
diff --git a/test/snapshots/while.txt b/test/snapshots/while.txt
index 4f87258cf94..84b2770ac6b 100644
--- a/test/snapshots/while.txt
+++ b/test/snapshots/while.txt
@@ -36,7 +36,7 @@ ProgramNode(0...314)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar?"
        ),
        StatementsNode(88...98)(
diff --git a/test/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt b/test/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
index 481a9c5f92d..5fc3ec49db1 100644
--- a/test/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
+++ b/test/snapshots/whitequark/ambiuous_quoted_label_in_ternary_operator.txt
@@ -3,10 +3,10 @@ ProgramNode(0...15)(
   StatementsNode(0...15)(
     [IfNode(0...15)(
        nil,
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        StatementsNode(4...10)(
          [CallNode(4...10)(
-            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 0, "b"),
+            CallNode(4...5)(nil, nil, (4...5), nil, nil, nil, nil, 2, "b"),
             nil,
             (6...7),
             nil,
diff --git a/test/snapshots/whitequark/and.txt b/test/snapshots/whitequark/and.txt
index 6a488935e0d..c6641a692b9 100644
--- a/test/snapshots/whitequark/and.txt
+++ b/test/snapshots/whitequark/and.txt
@@ -2,13 +2,13 @@ ProgramNode(0...23)(
   [],
   StatementsNode(0...23)(
     [AndNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "bar"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar"),
        (4...6)
      ),
      AndNode(12...23)(
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "foo"),
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "bar"),
+       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
+       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "bar"),
        (16...19)
      )]
   )
diff --git a/test/snapshots/whitequark/and_asgn.txt b/test/snapshots/whitequark/and_asgn.txt
index abbaf776174..d42bcc35f3e 100644
--- a/test/snapshots/whitequark/and_asgn.txt
+++ b/test/snapshots/whitequark/and_asgn.txt
@@ -3,7 +3,7 @@ ProgramNode(0...28)(
   StatementsNode(0...28)(
     [CallOperatorAndWriteNode(0...11)(
        CallNode(0...5)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          (3...4),
          (4...5),
          nil,
@@ -18,7 +18,7 @@ ProgramNode(0...28)(
      ),
      CallOperatorAndWriteNode(13...28)(
        CallNode(13...22)(
-         CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo"),
+         CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
          nil,
          (16...22),
          (16...17),
diff --git a/test/snapshots/whitequark/and_or_masgn.txt b/test/snapshots/whitequark/and_or_masgn.txt
index 7fc2e35e047..eb768ac90a4 100644
--- a/test/snapshots/whitequark/and_or_masgn.txt
+++ b/test/snapshots/whitequark/and_or_masgn.txt
@@ -2,7 +2,7 @@ ProgramNode(0...40)(
   [:a, :b],
   StatementsNode(0...40)(
     [AndNode(0...19)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        ParenthesesNode(7...19)(
          StatementsNode(8...18)(
            [MultiWriteNode(8...18)(
@@ -17,7 +17,7 @@ ProgramNode(0...40)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               nil,
@@ -30,7 +30,7 @@ ProgramNode(0...40)(
        (4...6)
      ),
      OrNode(21...40)(
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "foo"),
+       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
        ParenthesesNode(28...40)(
          StatementsNode(29...39)(
            [MultiWriteNode(29...39)(
@@ -45,7 +45,7 @@ ProgramNode(0...40)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               nil,
diff --git a/test/snapshots/whitequark/args_args_assocs.txt b/test/snapshots/whitequark/args_args_assocs.txt
index ee787d08a2f..5363d6780d0 100644
--- a/test/snapshots/whitequark/args_args_assocs.txt
+++ b/test/snapshots/whitequark/args_args_assocs.txt
@@ -7,7 +7,7 @@ ProgramNode(0...46)(
        (0...3),
        (3...4),
        ArgumentsNode(4...18)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
           KeywordHashNode(9...18)(
             [AssocNode(9...18)(
                SymbolNode(9...13)((9...10), (10...13), nil, "foo"),
@@ -27,7 +27,7 @@ ProgramNode(0...46)(
        (21...24),
        (24...25),
        ArgumentsNode(25...45)(
-         [CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
           KeywordHashNode(30...39)(
             [AssocNode(30...39)(
                SymbolNode(30...34)((30...31), (31...34), nil, "foo"),
@@ -44,7 +44,7 @@ ProgramNode(0...46)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (41...42)
diff --git a/test/snapshots/whitequark/args_args_assocs_comma.txt b/test/snapshots/whitequark/args_args_assocs_comma.txt
index fead72a5333..da9ea1bd810 100644
--- a/test/snapshots/whitequark/args_args_assocs_comma.txt
+++ b/test/snapshots/whitequark/args_args_assocs_comma.txt
@@ -2,12 +2,12 @@ ProgramNode(0...20)(
   [],
   StatementsNode(0...20)(
     [CallNode(0...20)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...20),
        (3...4),
        ArgumentsNode(4...18)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar"),
+         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
           KeywordHashNode(9...18)(
             [AssocNode(9...18)(
                SymbolNode(9...13)((9...10), (10...13), nil, "baz"),
diff --git a/test/snapshots/whitequark/args_args_comma.txt b/test/snapshots/whitequark/args_args_comma.txt
index ff53a58eca6..a6014eebc42 100644
--- a/test/snapshots/whitequark/args_args_comma.txt
+++ b/test/snapshots/whitequark/args_args_comma.txt
@@ -2,12 +2,12 @@ ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
     [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...9),
        (3...4),
        ArgumentsNode(4...7)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
        ),
        (8...9),
        nil,
diff --git a/test/snapshots/whitequark/args_args_star.txt b/test/snapshots/whitequark/args_args_star.txt
index 52b2c412028..ed007cfa5af 100644
--- a/test/snapshots/whitequark/args_args_star.txt
+++ b/test/snapshots/whitequark/args_args_star.txt
@@ -7,7 +7,7 @@ ProgramNode(0...36)(
        (0...3),
        (3...4),
        ArgumentsNode(4...13)(
-         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
           SplatNode(9...13)(
             (9...10),
             CallNode(10...13)(
@@ -18,7 +18,7 @@ ProgramNode(0...36)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )
           )]
@@ -34,7 +34,7 @@ ProgramNode(0...36)(
        (16...19),
        (19...20),
        ArgumentsNode(20...35)(
-         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
           SplatNode(25...29)(
             (25...26),
             CallNode(26...29)(
@@ -45,7 +45,7 @@ ProgramNode(0...36)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )
           ),
@@ -58,7 +58,7 @@ ProgramNode(0...36)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (31...32)
diff --git a/test/snapshots/whitequark/args_assocs.txt b/test/snapshots/whitequark/args_assocs.txt
index 8905c41d17c..8fa24ab4795 100644
--- a/test/snapshots/whitequark/args_assocs.txt
+++ b/test/snapshots/whitequark/args_assocs.txt
@@ -42,7 +42,7 @@ ProgramNode(0...114)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (31...32)
@@ -59,7 +59,7 @@ ProgramNode(0...114)(
        (43...46),
        nil,
        ArgumentsNode(47...59)(
-         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
           KeywordHashNode(52...59)(
             [AssocNode(52...59)(
                SymbolNode(52...54)((52...53), (53...54), nil, "a"),
diff --git a/test/snapshots/whitequark/args_assocs_comma.txt b/test/snapshots/whitequark/args_assocs_comma.txt
index 0989a82c635..97de8d44ef9 100644
--- a/test/snapshots/whitequark/args_assocs_comma.txt
+++ b/test/snapshots/whitequark/args_assocs_comma.txt
@@ -2,7 +2,7 @@ ProgramNode(0...15)(
   [],
   StatementsNode(0...15)(
     [CallNode(0...15)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...15),
        (3...4),
diff --git a/test/snapshots/whitequark/args_assocs_legacy.txt b/test/snapshots/whitequark/args_assocs_legacy.txt
index 8905c41d17c..8fa24ab4795 100644
--- a/test/snapshots/whitequark/args_assocs_legacy.txt
+++ b/test/snapshots/whitequark/args_assocs_legacy.txt
@@ -42,7 +42,7 @@ ProgramNode(0...114)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (31...32)
@@ -59,7 +59,7 @@ ProgramNode(0...114)(
        (43...46),
        nil,
        ArgumentsNode(47...59)(
-         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 0, "foo"),
+         [CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
           KeywordHashNode(52...59)(
             [AssocNode(52...59)(
                SymbolNode(52...54)((52...53), (53...54), nil, "a"),
diff --git a/test/snapshots/whitequark/args_block_pass.txt b/test/snapshots/whitequark/args_block_pass.txt
index 548019ab2f6..50c51ba7b3c 100644
--- a/test/snapshots/whitequark/args_block_pass.txt
+++ b/test/snapshots/whitequark/args_block_pass.txt
@@ -8,7 +8,7 @@ ProgramNode(0...9)(
        (3...4),
        ArgumentsNode(4...8)(
          [BlockArgumentNode(4...8)(
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "bar"),
+            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar"),
             (4...5)
           )]
        ),
diff --git a/test/snapshots/whitequark/args_cmd.txt b/test/snapshots/whitequark/args_cmd.txt
index cbb8ec0769d..9b0cfedb006 100644
--- a/test/snapshots/whitequark/args_cmd.txt
+++ b/test/snapshots/whitequark/args_cmd.txt
@@ -21,7 +21,7 @@ ProgramNode(0...10)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
diff --git a/test/snapshots/whitequark/args_star.txt b/test/snapshots/whitequark/args_star.txt
index 160865108bd..eaffafdd3d4 100644
--- a/test/snapshots/whitequark/args_star.txt
+++ b/test/snapshots/whitequark/args_star.txt
@@ -9,7 +9,7 @@ ProgramNode(0...26)(
        ArgumentsNode(4...8)(
          [SplatNode(4...8)(
             (4...5),
-            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "bar")
+            CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "bar")
           )]
        ),
        (8...9),
@@ -33,7 +33,7 @@ ProgramNode(0...26)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )
           ),
@@ -46,7 +46,7 @@ ProgramNode(0...26)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             ),
             (21...22)
diff --git a/test/snapshots/whitequark/array_splat.txt b/test/snapshots/whitequark/array_splat.txt
index a691e674053..770e42e8143 100644
--- a/test/snapshots/whitequark/array_splat.txt
+++ b/test/snapshots/whitequark/array_splat.txt
@@ -4,7 +4,7 @@ ProgramNode(0...31)(
     [ArrayNode(0...6)(
        [SplatNode(1...5)(
           (1...2),
-          CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 0, "foo")
+          CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo")
         )],
        (0...1),
        (5...6)
@@ -13,7 +13,7 @@ ProgramNode(0...31)(
        [IntegerNode(9...10)(),
         SplatNode(12...16)(
           (12...13),
-          CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo")
+          CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")
         ),
         IntegerNode(18...19)()],
        (8...9),
@@ -23,7 +23,7 @@ ProgramNode(0...31)(
        [IntegerNode(23...24)(),
         SplatNode(26...30)(
           (26...27),
-          CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 0, "foo")
+          CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo")
         )],
        (22...23),
        (30...31)
diff --git a/test/snapshots/whitequark/array_symbols_interp.txt b/test/snapshots/whitequark/array_symbols_interp.txt
index 204ee1372d8..8488e7e9c23 100644
--- a/test/snapshots/whitequark/array_symbols_interp.txt
+++ b/test/snapshots/whitequark/array_symbols_interp.txt
@@ -16,7 +16,7 @@ ProgramNode(0...29)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
@@ -42,7 +42,7 @@ ProgramNode(0...29)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
diff --git a/test/snapshots/whitequark/array_words_interp.txt b/test/snapshots/whitequark/array_words_interp.txt
index e90e20d5e2b..e70dcc7a890 100644
--- a/test/snapshots/whitequark/array_words_interp.txt
+++ b/test/snapshots/whitequark/array_words_interp.txt
@@ -16,7 +16,7 @@ ProgramNode(0...38)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
@@ -42,7 +42,7 @@ ProgramNode(0...38)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
diff --git a/test/snapshots/whitequark/asgn_mrhs.txt b/test/snapshots/whitequark/asgn_mrhs.txt
index 947c8e4450d..6062873bd77 100644
--- a/test/snapshots/whitequark/asgn_mrhs.txt
+++ b/test/snapshots/whitequark/asgn_mrhs.txt
@@ -6,7 +6,7 @@ ProgramNode(0...41)(
        0,
        SplatNode(6...10)(
          (6...7),
-         CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "bar")
+         CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar")
        ),
        (0...3),
        (4...5)
@@ -15,7 +15,7 @@ ProgramNode(0...41)(
        :foo,
        0,
        ArrayNode(18...24)(
-         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 0, "bar"),
+         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar"),
           IntegerNode(23...24)()],
          nil,
          nil
@@ -27,7 +27,7 @@ ProgramNode(0...41)(
        :foo,
        0,
        ArrayNode(32...41)(
-         [CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 0, "baz"),
+         [CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 2, "baz"),
           SplatNode(37...41)(
             (37...38),
             CallNode(38...41)(
@@ -38,7 +38,7 @@ ProgramNode(0...41)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )
           )],
diff --git a/test/snapshots/whitequark/bang.txt b/test/snapshots/whitequark/bang.txt
index 25f3da6f04e..65ea29dfd39 100644
--- a/test/snapshots/whitequark/bang.txt
+++ b/test/snapshots/whitequark/bang.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [CallNode(0...4)(
-       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 0, "foo"),
+       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 2, "foo"),
        nil,
        (0...1),
        nil,
diff --git a/test/snapshots/whitequark/bang_cmd.txt b/test/snapshots/whitequark/bang_cmd.txt
index 3e5080cebd7..23921cc1b34 100644
--- a/test/snapshots/whitequark/bang_cmd.txt
+++ b/test/snapshots/whitequark/bang_cmd.txt
@@ -8,7 +8,7 @@ ProgramNode(0...6)(
          (1...2),
          nil,
          ArgumentsNode(3...6)(
-           [CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "foo")]
+           [CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo")]
          ),
          nil,
          nil,
diff --git a/test/snapshots/whitequark/beginless_erange_after_newline.txt b/test/snapshots/whitequark/beginless_erange_after_newline.txt
index 50383976f2b..dbe6e585a28 100644
--- a/test/snapshots/whitequark/beginless_erange_after_newline.txt
+++ b/test/snapshots/whitequark/beginless_erange_after_newline.txt
@@ -1,7 +1,7 @@
 ProgramNode(0...10)(
   [],
   StatementsNode(0...10)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
      RangeNode(4...10)(nil, IntegerNode(7...10)(), (4...7), 1)]
   )
 )
diff --git a/test/snapshots/whitequark/beginless_irange_after_newline.txt b/test/snapshots/whitequark/beginless_irange_after_newline.txt
index a49985c7626..f784561012d 100644
--- a/test/snapshots/whitequark/beginless_irange_after_newline.txt
+++ b/test/snapshots/whitequark/beginless_irange_after_newline.txt
@@ -1,7 +1,7 @@
 ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
      RangeNode(4...9)(nil, IntegerNode(6...9)(), (4...6), 0)]
   )
 )
diff --git a/test/snapshots/whitequark/break.txt b/test/snapshots/whitequark/break.txt
index df24567c4da..46d3b6a5703 100644
--- a/test/snapshots/whitequark/break.txt
+++ b/test/snapshots/whitequark/break.txt
@@ -4,7 +4,7 @@ ProgramNode(0...37)(
     [BreakNode(0...5)(nil, (0...5)),
      BreakNode(7...16)(
        ArgumentsNode(13...16)(
-         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")]
        ),
        (7...12)
      ),
@@ -26,7 +26,7 @@ ProgramNode(0...37)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/break_block.txt b/test/snapshots/whitequark/break_block.txt
index 41e083f25fb..ad81bcf1637 100644
--- a/test/snapshots/whitequark/break_block.txt
+++ b/test/snapshots/whitequark/break_block.txt
@@ -17,7 +17,7 @@ ProgramNode(0...20)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/bug_452.txt b/test/snapshots/whitequark/bug_452.txt
index 78fc5f28a21..31cf38cfc2e 100644
--- a/test/snapshots/whitequark/bug_452.txt
+++ b/test/snapshots/whitequark/bug_452.txt
@@ -29,7 +29,7 @@ ProgramNode(0...37)(
        "td"
      ),
      CallNode(23...37)(
-       CallNode(23...25)(nil, nil, (23...25), nil, nil, nil, nil, 0, "td"),
+       CallNode(23...25)(nil, nil, (23...25), nil, nil, nil, nil, 2, "td"),
        (25...26),
        (26...29),
        nil,
diff --git a/test/snapshots/whitequark/bug_cmdarg.txt b/test/snapshots/whitequark/bug_cmdarg.txt
index bfce2487822..f953e561456 100644
--- a/test/snapshots/whitequark/bug_cmdarg.txt
+++ b/test/snapshots/whitequark/bug_cmdarg.txt
@@ -34,7 +34,7 @@ ProgramNode(0...56)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "dogs"
           )]
        ),
diff --git a/test/snapshots/whitequark/bug_lambda_leakage.txt b/test/snapshots/whitequark/bug_lambda_leakage.txt
index 4fac00cf349..c59109d0a95 100644
--- a/test/snapshots/whitequark/bug_lambda_leakage.txt
+++ b/test/snapshots/whitequark/bug_lambda_leakage.txt
@@ -20,6 +20,6 @@ ProgramNode(0...19)(
        ),
        nil
      ),
-     CallNode(14...19)(nil, nil, (14...19), nil, nil, nil, nil, 0, "scope")]
+     CallNode(14...19)(nil, nil, (14...19), nil, nil, nil, nil, 2, "scope")]
   )
 )
diff --git a/test/snapshots/whitequark/case_cond.txt b/test/snapshots/whitequark/case_cond.txt
index 4fbc69e3baf..207fbe9a485 100644
--- a/test/snapshots/whitequark/case_cond.txt
+++ b/test/snapshots/whitequark/case_cond.txt
@@ -13,7 +13,7 @@ ProgramNode(0...26)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "foo"
            )],
           StatementsNode(16...21)(
diff --git a/test/snapshots/whitequark/case_cond_else.txt b/test/snapshots/whitequark/case_cond_else.txt
index c4a035f1783..263c4d3a081 100644
--- a/test/snapshots/whitequark/case_cond_else.txt
+++ b/test/snapshots/whitequark/case_cond_else.txt
@@ -13,7 +13,7 @@ ProgramNode(0...38)(
              nil,
              nil,
              nil,
-             0,
+             2,
              "foo"
            )],
           StatementsNode(16...21)(
diff --git a/test/snapshots/whitequark/case_expr.txt b/test/snapshots/whitequark/case_expr.txt
index 22763ee9fed..8b01d8f81a5 100644
--- a/test/snapshots/whitequark/case_expr.txt
+++ b/test/snapshots/whitequark/case_expr.txt
@@ -2,7 +2,7 @@ ProgramNode(0...30)(
   [],
   StatementsNode(0...30)(
     [CaseNode(0...30)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(10...25)(
           (10...14),
           [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
@@ -15,7 +15,7 @@ ProgramNode(0...30)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
diff --git a/test/snapshots/whitequark/case_expr_else.txt b/test/snapshots/whitequark/case_expr_else.txt
index 9782ba04cbb..79356e6cf39 100644
--- a/test/snapshots/whitequark/case_expr_else.txt
+++ b/test/snapshots/whitequark/case_expr_else.txt
@@ -2,7 +2,7 @@ ProgramNode(0...40)(
   [],
   StatementsNode(0...40)(
     [CaseNode(0...40)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(10...25)(
           (10...14),
           [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
@@ -15,7 +15,7 @@ ProgramNode(0...40)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
@@ -31,7 +31,7 @@ ProgramNode(0...40)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
diff --git a/test/snapshots/whitequark/comments_before_leading_dot__27.txt b/test/snapshots/whitequark/comments_before_leading_dot__27.txt
index 08dc7c2f5ca..b01a481eca0 100644
--- a/test/snapshots/whitequark/comments_before_leading_dot__27.txt
+++ b/test/snapshots/whitequark/comments_before_leading_dot__27.txt
@@ -2,7 +2,7 @@ ProgramNode(0...55)(
   [],
   StatementsNode(0...55)(
     [CallNode(0...13)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (8...10),
        (10...13),
        nil,
@@ -13,7 +13,7 @@ ProgramNode(0...55)(
        "foo"
      ),
      CallNode(16...28)(
-       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 0, "a"),
+       CallNode(16...17)(nil, nil, (16...17), nil, nil, nil, nil, 2, "a"),
        (24...25),
        (25...28),
        nil,
@@ -24,7 +24,7 @@ ProgramNode(0...55)(
        "foo"
      ),
      CallNode(31...42)(
-       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 0, "a"),
+       CallNode(31...32)(nil, nil, (31...32), nil, nil, nil, nil, 2, "a"),
        (37...39),
        (39...42),
        nil,
@@ -35,7 +35,7 @@ ProgramNode(0...55)(
        "foo"
      ),
      CallNode(45...55)(
-       CallNode(45...46)(nil, nil, (45...46), nil, nil, nil, nil, 0, "a"),
+       CallNode(45...46)(nil, nil, (45...46), nil, nil, nil, nil, 2, "a"),
        (51...52),
        (52...55),
        nil,
diff --git a/test/snapshots/whitequark/cond_begin.txt b/test/snapshots/whitequark/cond_begin.txt
index 0d378e24c95..e3e3650e484 100644
--- a/test/snapshots/whitequark/cond_begin.txt
+++ b/test/snapshots/whitequark/cond_begin.txt
@@ -5,13 +5,13 @@ ProgramNode(0...18)(
        (0...2),
        ParenthesesNode(3...8)(
          StatementsNode(4...7)(
-           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar")]
+           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar")]
          ),
          (3...4),
          (7...8)
        ),
        StatementsNode(10...13)(
-         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo")]
        ),
        nil,
        (15...18)
diff --git a/test/snapshots/whitequark/cond_begin_masgn.txt b/test/snapshots/whitequark/cond_begin_masgn.txt
index 17a0cd4141a..10e2f5d8dc7 100644
--- a/test/snapshots/whitequark/cond_begin_masgn.txt
+++ b/test/snapshots/whitequark/cond_begin_masgn.txt
@@ -5,7 +5,7 @@ ProgramNode(0...25)(
        (0...2),
        ParenthesesNode(3...20)(
          StatementsNode(4...19)(
-           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar"),
+           [CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
             MultiWriteNode(9...19)(
               [LocalVariableWriteNode(9...10)(:a, 0, nil, (9...10), nil),
                LocalVariableWriteNode(12...13)(:b, 0, nil, (12...13), nil)],
@@ -18,7 +18,7 @@ ProgramNode(0...25)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               ),
               nil,
diff --git a/test/snapshots/whitequark/cond_eflipflop.txt b/test/snapshots/whitequark/cond_eflipflop.txt
index 6e1e6718d50..18177a7779e 100644
--- a/test/snapshots/whitequark/cond_eflipflop.txt
+++ b/test/snapshots/whitequark/cond_eflipflop.txt
@@ -5,7 +5,7 @@ ProgramNode(0...31)(
        ParenthesesNode(1...12)(
          StatementsNode(2...11)(
            [RangeNode(2...11)(
-              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 0, "foo"),
+              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo"),
               CallNode(8...11)(
                 nil,
                 nil,
@@ -14,7 +14,7 @@ ProgramNode(0...31)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (5...8),
@@ -36,8 +36,8 @@ ProgramNode(0...31)(
      IfNode(14...31)(
        (14...16),
        RangeNode(17...26)(
-         CallNode(17...20)(nil, nil, (17...20), nil, nil, nil, nil, 0, "foo"),
-         CallNode(23...26)(nil, nil, (23...26), nil, nil, nil, nil, 0, "bar"),
+         CallNode(17...20)(nil, nil, (17...20), nil, nil, nil, nil, 2, "foo"),
+         CallNode(23...26)(nil, nil, (23...26), nil, nil, nil, nil, 2, "bar"),
          (20...23),
          1
        ),
diff --git a/test/snapshots/whitequark/cond_iflipflop.txt b/test/snapshots/whitequark/cond_iflipflop.txt
index e45eec8922e..760561ebce3 100644
--- a/test/snapshots/whitequark/cond_iflipflop.txt
+++ b/test/snapshots/whitequark/cond_iflipflop.txt
@@ -5,7 +5,7 @@ ProgramNode(0...29)(
        ParenthesesNode(1...11)(
          StatementsNode(2...10)(
            [RangeNode(2...10)(
-              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 0, "foo"),
+              CallNode(2...5)(nil, nil, (2...5), nil, nil, nil, nil, 2, "foo"),
               CallNode(7...10)(
                 nil,
                 nil,
@@ -14,7 +14,7 @@ ProgramNode(0...29)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (5...7),
@@ -36,8 +36,8 @@ ProgramNode(0...29)(
      IfNode(13...29)(
        (13...15),
        RangeNode(16...24)(
-         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "foo"),
-         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "bar"),
+         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
+         CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "bar"),
          (19...21),
          0
        ),
diff --git a/test/snapshots/whitequark/dedenting_heredoc.txt b/test/snapshots/whitequark/dedenting_heredoc.txt
index 8db35f72287..144b17bcd7b 100644
--- a/test/snapshots/whitequark/dedenting_heredoc.txt
+++ b/test/snapshots/whitequark/dedenting_heredoc.txt
@@ -46,7 +46,7 @@ ProgramNode(0...327)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "foo"
                   )]
                ),
@@ -304,7 +304,7 @@ ProgramNode(0...327)(
                     nil,
                     nil,
                     nil,
-                    0,
+                    2,
                     "foo"
                   )]
                ),
diff --git a/test/snapshots/whitequark/defined.txt b/test/snapshots/whitequark/defined.txt
index 8dc2e5493ea..12a30055939 100644
--- a/test/snapshots/whitequark/defined.txt
+++ b/test/snapshots/whitequark/defined.txt
@@ -9,13 +9,13 @@ ProgramNode(0...42)(
      ),
      DefinedNode(15...27)(
        nil,
-       CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 0, "foo"),
+       CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 2, "foo"),
        nil,
        (15...23)
      ),
      DefinedNode(29...42)(
        (37...38),
-       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 0, "foo"),
+       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "foo"),
        (41...42),
        (29...37)
      )]
diff --git a/test/snapshots/whitequark/defs.txt b/test/snapshots/whitequark/defs.txt
index d27de42bf22..ef7d56edbb7 100644
--- a/test/snapshots/whitequark/defs.txt
+++ b/test/snapshots/whitequark/defs.txt
@@ -4,7 +4,7 @@ ProgramNode(0...100)(
     [DefNode(0...18)(
        (10...13),
        ParenthesesNode(4...9)(
-         CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+         CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
          (4...5),
          (8...9)
        ),
diff --git a/test/snapshots/whitequark/endless_comparison_method.txt b/test/snapshots/whitequark/endless_comparison_method.txt
index 47f43e82351..fa837056595 100644
--- a/test/snapshots/whitequark/endless_comparison_method.txt
+++ b/test/snapshots/whitequark/endless_comparison_method.txt
@@ -22,7 +22,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
@@ -55,7 +55,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
@@ -88,7 +88,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
@@ -121,7 +121,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
@@ -154,7 +154,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
@@ -187,7 +187,7 @@ ProgramNode(0...179)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "do_something"
           )]
        ),
diff --git a/test/snapshots/whitequark/endless_method.txt b/test/snapshots/whitequark/endless_method.txt
index 24bd704d3c7..a80e6b57db8 100644
--- a/test/snapshots/whitequark/endless_method.txt
+++ b/test/snapshots/whitequark/endless_method.txt
@@ -49,7 +49,7 @@ ProgramNode(0...78)(
      ),
      DefNode(36...54)(
        (44...47),
-       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 0, "obj"),
+       CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "obj"),
        nil,
        StatementsNode(52...54)([IntegerNode(52...54)()]),
        [],
@@ -62,7 +62,7 @@ ProgramNode(0...78)(
      ),
      DefNode(56...78)(
        (64...67),
-       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 0, "obj"),
+       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 2, "obj"),
        ParametersNode(68...69)(
          [RequiredParameterNode(68...69)(:x)],
          [],
diff --git a/test/snapshots/whitequark/endless_method_command_syntax.txt b/test/snapshots/whitequark/endless_method_command_syntax.txt
index 476b6f34f68..33c64edfed2 100644
--- a/test/snapshots/whitequark/endless_method_command_syntax.txt
+++ b/test/snapshots/whitequark/endless_method_command_syntax.txt
@@ -90,7 +90,7 @@ ProgramNode(0...278)(
      ),
      DefNode(71...97)(
        (79...82),
-       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 0, "obj"),
+       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 2, "obj"),
        nil,
        StatementsNode(85...97)(
          [CallNode(85...97)(
@@ -125,7 +125,7 @@ ProgramNode(0...278)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "obj"
        ),
        nil,
@@ -167,7 +167,7 @@ ProgramNode(0...278)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "obj"
        ),
        ParametersNode(141...142)(
diff --git a/test/snapshots/whitequark/ensure.txt b/test/snapshots/whitequark/ensure.txt
index 2306cc754d2..abc443a2bb2 100644
--- a/test/snapshots/whitequark/ensure.txt
+++ b/test/snapshots/whitequark/ensure.txt
@@ -4,7 +4,7 @@ ProgramNode(0...29)(
     [BeginNode(0...29)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        nil,
        nil,
@@ -19,7 +19,7 @@ ProgramNode(0...29)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/for.txt b/test/snapshots/whitequark/for.txt
index cb99b7854e3..e62da36cd54 100644
--- a/test/snapshots/whitequark/for.txt
+++ b/test/snapshots/whitequark/for.txt
@@ -9,7 +9,7 @@ ProgramNode(0...48)(
          nil,
          nil
        ),
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 0, "foo"),
+       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(16...19)(
          [CallNode(16...19)(
             nil,
@@ -36,7 +36,7 @@ ProgramNode(0...48)(
          nil,
          nil
        ),
-       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 0, "foo"),
+       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(40...43)(
          [CallNode(40...43)(
             nil,
diff --git a/test/snapshots/whitequark/for_mlhs.txt b/test/snapshots/whitequark/for_mlhs.txt
index 53e5f67750b..07bdb0662a5 100644
--- a/test/snapshots/whitequark/for_mlhs.txt
+++ b/test/snapshots/whitequark/for_mlhs.txt
@@ -10,7 +10,7 @@ ProgramNode(0...28)(
          nil,
          nil
        ),
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "foo"),
+       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(17...23)(
          [CallNode(17...23)(
             nil,
diff --git a/test/snapshots/whitequark/hash_kwsplat.txt b/test/snapshots/whitequark/hash_kwsplat.txt
index ee338760826..bb56b81800b 100644
--- a/test/snapshots/whitequark/hash_kwsplat.txt
+++ b/test/snapshots/whitequark/hash_kwsplat.txt
@@ -9,7 +9,7 @@ ProgramNode(0...17)(
           nil
         ),
         AssocSplatNode(10...15)(
-          CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "bar"),
+          CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar"),
           (10...12)
         )],
        (16...17)
diff --git a/test/snapshots/whitequark/hash_label_end.txt b/test/snapshots/whitequark/hash_label_end.txt
index 7e208d4d84f..b5d4273d5ba 100644
--- a/test/snapshots/whitequark/hash_label_end.txt
+++ b/test/snapshots/whitequark/hash_label_end.txt
@@ -9,7 +9,7 @@ ProgramNode(0...50)(
        ArgumentsNode(2...11)(
          [IfNode(2...11)(
             nil,
-            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a"),
+            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
             StatementsNode(6...9)(
               [StringNode(6...9)((6...7), (7...8), (8...9), "a")]
             ),
diff --git a/test/snapshots/whitequark/if.txt b/test/snapshots/whitequark/if.txt
index 4d830abafe0..069eb07f253 100644
--- a/test/snapshots/whitequark/if.txt
+++ b/test/snapshots/whitequark/if.txt
@@ -3,18 +3,18 @@ ProgramNode(0...38)(
   StatementsNode(0...38)(
     [IfNode(0...20)(
        (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "foo"),
+       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (17...20)
      ),
      IfNode(22...38)(
        (22...24),
-       CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 0, "foo"),
+       CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(30...33)(
-         [CallNode(30...33)(nil, nil, (30...33), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(30...33)(nil, nil, (30...33), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (35...38)
diff --git a/test/snapshots/whitequark/if_else.txt b/test/snapshots/whitequark/if_else.txt
index 936195e8da9..d8799a330c5 100644
--- a/test/snapshots/whitequark/if_else.txt
+++ b/test/snapshots/whitequark/if_else.txt
@@ -3,9 +3,9 @@ ProgramNode(0...58)(
   StatementsNode(0...58)(
     [IfNode(0...30)(
        (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "foo"),
+       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
        ),
        ElseNode(17...30)(
          (17...21),
@@ -18,7 +18,7 @@ ProgramNode(0...58)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -28,9 +28,9 @@ ProgramNode(0...58)(
      ),
      IfNode(32...58)(
        (32...34),
-       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 0, "foo"),
+       CallNode(35...38)(nil, nil, (35...38), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(40...43)(
-         [CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(40...43)(nil, nil, (40...43), nil, nil, nil, nil, 2, "bar")]
        ),
        ElseNode(45...58)(
          (45...49),
@@ -43,7 +43,7 @@ ProgramNode(0...58)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
diff --git a/test/snapshots/whitequark/if_elsif.txt b/test/snapshots/whitequark/if_elsif.txt
index 35add805657..953d565bf62 100644
--- a/test/snapshots/whitequark/if_elsif.txt
+++ b/test/snapshots/whitequark/if_elsif.txt
@@ -3,13 +3,13 @@ ProgramNode(0...38)(
   StatementsNode(0...38)(
     [IfNode(0...38)(
        (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "foo"),
+       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "bar")]
        ),
        IfNode(13...38)(
          (13...18),
-         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 0, "baz"),
+         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "baz"),
          StatementsNode(24...25)([IntegerNode(24...25)()]),
          ElseNode(27...38)(
            (27...31),
diff --git a/test/snapshots/whitequark/if_masgn__24.txt b/test/snapshots/whitequark/if_masgn__24.txt
index 59b556f6046..94e63ac4f7f 100644
--- a/test/snapshots/whitequark/if_masgn__24.txt
+++ b/test/snapshots/whitequark/if_masgn__24.txt
@@ -17,7 +17,7 @@ ProgramNode(0...20)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               ),
               nil,
diff --git a/test/snapshots/whitequark/if_mod.txt b/test/snapshots/whitequark/if_mod.txt
index 5325b8660a7..9a6575b5d1d 100644
--- a/test/snapshots/whitequark/if_mod.txt
+++ b/test/snapshots/whitequark/if_mod.txt
@@ -3,9 +3,9 @@ ProgramNode(0...10)(
   StatementsNode(0...10)(
     [IfNode(0...10)(
        (4...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...3)(
-         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil
diff --git a/test/snapshots/whitequark/if_nl_then.txt b/test/snapshots/whitequark/if_nl_then.txt
index 0dae26ffdf4..db1b5231ef2 100644
--- a/test/snapshots/whitequark/if_nl_then.txt
+++ b/test/snapshots/whitequark/if_nl_then.txt
@@ -3,9 +3,9 @@ ProgramNode(0...19)(
   StatementsNode(0...19)(
     [IfNode(0...19)(
        (0...2),
-       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 0, "foo"),
+       CallNode(3...6)(nil, nil, (3...6), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(12...15)(
-         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (16...19)
diff --git a/test/snapshots/whitequark/kwbegin_compstmt.txt b/test/snapshots/whitequark/kwbegin_compstmt.txt
index 0d05407aad9..64911792dc6 100644
--- a/test/snapshots/whitequark/kwbegin_compstmt.txt
+++ b/test/snapshots/whitequark/kwbegin_compstmt.txt
@@ -4,7 +4,7 @@ ProgramNode(0...20)(
     [BeginNode(0...20)(
        (0...5),
        StatementsNode(6...16)(
-         [CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 0, "foo!"),
+         [CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 2, "foo!"),
           CallNode(12...16)(
             nil,
             nil,
@@ -13,7 +13,7 @@ ProgramNode(0...20)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar!"
           )]
        ),
diff --git a/test/snapshots/whitequark/lvar.txt b/test/snapshots/whitequark/lvar.txt
index fc27a87f849..24f27ad073d 100644
--- a/test/snapshots/whitequark/lvar.txt
+++ b/test/snapshots/whitequark/lvar.txt
@@ -1,6 +1,6 @@
 ProgramNode(0...3)(
   [],
   StatementsNode(0...3)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo")]
+    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo")]
   )
 )
diff --git a/test/snapshots/whitequark/masgn_nested.txt b/test/snapshots/whitequark/masgn_nested.txt
index 6321eaa74a1..98f1c094d00 100644
--- a/test/snapshots/whitequark/masgn_nested.txt
+++ b/test/snapshots/whitequark/masgn_nested.txt
@@ -11,7 +11,7 @@ ProgramNode(2...30)(
           (5...6)
         )],
        (8...9),
-       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 0, "foo"),
+       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo"),
        (0...1),
        (6...7)
      ),
@@ -26,7 +26,7 @@ ProgramNode(2...30)(
           (23...24)
         )],
        (25...26),
-       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 0, "foo"),
+       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo"),
        nil,
        nil
      )]
diff --git a/test/snapshots/whitequark/masgn_splat.txt b/test/snapshots/whitequark/masgn_splat.txt
index a20c9a19190..ffc9c363836 100644
--- a/test/snapshots/whitequark/masgn_splat.txt
+++ b/test/snapshots/whitequark/masgn_splat.txt
@@ -4,7 +4,7 @@ ProgramNode(0...139)(
     [MultiWriteNode(0...7)(
        [SplatNode(0...1)((0...1), nil)],
        (2...3),
-       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "bar"),
+       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -19,7 +19,7 @@ ProgramNode(0...139)(
         LocalVariableWriteNode(12...13)(:c, 0, nil, (12...13), nil),
         LocalVariableWriteNode(15...16)(:d, 0, nil, (15...16), nil)],
        (17...18),
-       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 0, "bar"),
+       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -29,7 +29,7 @@ ProgramNode(0...139)(
           LocalVariableWriteNode(25...26)(:b, 0, nil, (25...26), nil)
         )],
        (27...28),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 0, "bar"),
+       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -46,7 +46,7 @@ ProgramNode(0...139)(
         ),
         LocalVariableWriteNode(38...39)(:c, 0, nil, (38...39), nil)],
        (40...41),
-       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 0, "bar"),
+       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -56,7 +56,7 @@ ProgramNode(0...139)(
        (59...60),
        SplatNode(61...65)(
          (61...62),
-         CallNode(62...65)(nil, nil, (62...65), nil, nil, nil, nil, 0, "foo")
+         CallNode(62...65)(nil, nil, (62...65), nil, nil, nil, nil, 2, "foo")
        ),
        nil,
        nil
@@ -65,7 +65,7 @@ ProgramNode(0...139)(
        [LocalVariableWriteNode(67...68)(:a, 0, nil, (67...68), nil),
         SplatNode(70...71)((70...71), nil)],
        (72...73),
-       CallNode(74...77)(nil, nil, (74...77), nil, nil, nil, nil, 0, "bar"),
+       CallNode(74...77)(nil, nil, (74...77), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -74,7 +74,7 @@ ProgramNode(0...139)(
         SplatNode(82...83)((82...83), nil),
         LocalVariableWriteNode(85...86)(:c, 0, nil, (85...86), nil)],
        (87...88),
-       CallNode(89...92)(nil, nil, (89...92), nil, nil, nil, nil, 0, "bar"),
+       CallNode(89...92)(nil, nil, (89...92), nil, nil, nil, nil, 2, "bar"),
        nil,
        nil
      ),
@@ -93,7 +93,7 @@ ProgramNode(0...139)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar"
        ),
        nil,
@@ -115,7 +115,7 @@ ProgramNode(0...139)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "bar"
        ),
        nil,
@@ -136,7 +136,7 @@ ProgramNode(0...139)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )
           ),
@@ -148,7 +148,7 @@ ProgramNode(0...139)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )],
          nil,
diff --git a/test/snapshots/whitequark/newline_in_hash_argument.txt b/test/snapshots/whitequark/newline_in_hash_argument.txt
index e2b04563816..fad1c854948 100644
--- a/test/snapshots/whitequark/newline_in_hash_argument.txt
+++ b/test/snapshots/whitequark/newline_in_hash_argument.txt
@@ -2,7 +2,7 @@ ProgramNode(0...74)(
   [:a, :b],
   StatementsNode(0...74)(
     [CaseNode(0...40)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [InNode(9...21)(
           HashPatternNode(12...14)(
             nil,
@@ -44,7 +44,7 @@ ProgramNode(0...74)(
        (37...40)
      ),
      CallNode(42...58)(
-       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 0, "obj"),
+       CallNode(42...45)(nil, nil, (42...45), nil, nil, nil, nil, 2, "obj"),
        (45...46),
        (46...49),
        nil,
@@ -63,7 +63,7 @@ ProgramNode(0...74)(
        "set"
      ),
      CallNode(60...74)(
-       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 0, "obj"),
+       CallNode(60...63)(nil, nil, (60...63), nil, nil, nil, nil, 2, "obj"),
        (63...64),
        (64...67),
        nil,
diff --git a/test/snapshots/whitequark/next.txt b/test/snapshots/whitequark/next.txt
index 06997e7d1af..07dbb690dac 100644
--- a/test/snapshots/whitequark/next.txt
+++ b/test/snapshots/whitequark/next.txt
@@ -4,7 +4,7 @@ ProgramNode(0...33)(
     [NextNode(0...4)(nil, (0...4)),
      NextNode(6...14)(
        ArgumentsNode(11...14)(
-         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo")]
        ),
        (6...10)
      ),
@@ -26,7 +26,7 @@ ProgramNode(0...33)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/next_block.txt b/test/snapshots/whitequark/next_block.txt
index 70f102b4174..20cbe0d837b 100644
--- a/test/snapshots/whitequark/next_block.txt
+++ b/test/snapshots/whitequark/next_block.txt
@@ -17,7 +17,7 @@ ProgramNode(0...19)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/not.txt b/test/snapshots/whitequark/not.txt
index e80943ad153..1dc7b381cd3 100644
--- a/test/snapshots/whitequark/not.txt
+++ b/test/snapshots/whitequark/not.txt
@@ -2,7 +2,7 @@ ProgramNode(0...24)(
   [],
   StatementsNode(0...24)(
     [CallNode(0...7)(
-       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 0, "foo"),
+       CallNode(4...7)(nil, nil, (4...7), nil, nil, nil, nil, 2, "foo"),
        nil,
        (0...3),
        nil,
@@ -24,7 +24,7 @@ ProgramNode(0...24)(
        "!"
      ),
      CallNode(16...24)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "foo"),
+       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
        nil,
        (16...19),
        (19...20),
diff --git a/test/snapshots/whitequark/not_cmd.txt b/test/snapshots/whitequark/not_cmd.txt
index b361e5b61c9..ff2acd00f5f 100644
--- a/test/snapshots/whitequark/not_cmd.txt
+++ b/test/snapshots/whitequark/not_cmd.txt
@@ -8,7 +8,7 @@ ProgramNode(0...9)(
          (4...5),
          nil,
          ArgumentsNode(6...9)(
-           [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo")]
+           [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
          ),
          nil,
          nil,
diff --git a/test/snapshots/whitequark/not_masgn__24.txt b/test/snapshots/whitequark/not_masgn__24.txt
index 6880ed75618..badac67e44f 100644
--- a/test/snapshots/whitequark/not_masgn__24.txt
+++ b/test/snapshots/whitequark/not_masgn__24.txt
@@ -16,7 +16,7 @@ ProgramNode(0...13)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               ),
               nil,
diff --git a/test/snapshots/whitequark/numbered_args_after_27.txt b/test/snapshots/whitequark/numbered_args_after_27.txt
index c2cf4217e3a..45decfc3b70 100644
--- a/test/snapshots/whitequark/numbered_args_after_27.txt
+++ b/test/snapshots/whitequark/numbered_args_after_27.txt
@@ -7,7 +7,7 @@ ProgramNode(0...65)(
        nil,
        StatementsNode(6...13)(
          [CallNode(6...13)(
-            CallNode(6...8)(nil, nil, (6...8), nil, nil, nil, nil, 0, "_1"),
+            CallNode(6...8)(nil, nil, (6...8), nil, nil, nil, nil, 2, "_1"),
             nil,
             (9...10),
             nil,
@@ -20,7 +20,7 @@ ProgramNode(0...65)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "_9"
                )]
             ),
@@ -45,7 +45,7 @@ ProgramNode(0...65)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "_1"
             ),
             nil,
@@ -60,7 +60,7 @@ ProgramNode(0...65)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "_9"
                )]
             ),
@@ -91,7 +91,7 @@ ProgramNode(0...65)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "_1"
               ),
               nil,
@@ -106,7 +106,7 @@ ProgramNode(0...65)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "_9"
                  )]
               ),
@@ -142,7 +142,7 @@ ProgramNode(0...65)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "_1"
               ),
               nil,
@@ -157,7 +157,7 @@ ProgramNode(0...65)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "_9"
                  )]
               ),
diff --git a/test/snapshots/whitequark/numparam_outside_block.txt b/test/snapshots/whitequark/numparam_outside_block.txt
index f99094a3a61..99cb79b9e29 100644
--- a/test/snapshots/whitequark/numparam_outside_block.txt
+++ b/test/snapshots/whitequark/numparam_outside_block.txt
@@ -1,14 +1,14 @@
 ProgramNode(0...83)(
   [],
   StatementsNode(0...83)(
-    [CallNode(0...2)(nil, nil, (0...2), nil, nil, nil, nil, 0, "_1"),
+    [CallNode(0...2)(nil, nil, (0...2), nil, nil, nil, nil, 2, "_1"),
      SingletonClassNode(4...25)(
        [],
        (4...9),
        (10...12),
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo"),
+       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(18...20)(
-         [CallNode(18...20)(nil, nil, (18...20), nil, nil, nil, nil, 0, "_1")]
+         [CallNode(18...20)(nil, nil, (18...20), nil, nil, nil, nil, 2, "_1")]
        ),
        (22...25)
      ),
@@ -19,7 +19,7 @@ ProgramNode(0...83)(
        nil,
        nil,
        StatementsNode(36...38)(
-         [CallNode(36...38)(nil, nil, (36...38), nil, nil, nil, nil, 0, "_1")]
+         [CallNode(36...38)(nil, nil, (36...38), nil, nil, nil, nil, 2, "_1")]
        ),
        (40...43)
      ),
@@ -28,7 +28,7 @@ ProgramNode(0...83)(
        SelfNode(49...53)(),
        nil,
        StatementsNode(57...59)(
-         [CallNode(57...59)(nil, nil, (57...59), nil, nil, nil, nil, 0, "_1")]
+         [CallNode(57...59)(nil, nil, (57...59), nil, nil, nil, nil, 2, "_1")]
        ),
        [],
        (45...48),
@@ -43,7 +43,7 @@ ProgramNode(0...83)(
        (66...72),
        ConstantReadNode(73...74)(),
        StatementsNode(76...78)(
-         [CallNode(76...78)(nil, nil, (76...78), nil, nil, nil, nil, 0, "_1")]
+         [CallNode(76...78)(nil, nil, (76...78), nil, nil, nil, nil, 2, "_1")]
        ),
        (80...83)
      )]
diff --git a/test/snapshots/whitequark/op_asgn.txt b/test/snapshots/whitequark/op_asgn.txt
index cb4b4a662f0..c0a4e0471fa 100644
--- a/test/snapshots/whitequark/op_asgn.txt
+++ b/test/snapshots/whitequark/op_asgn.txt
@@ -3,7 +3,7 @@ ProgramNode(0...35)(
   StatementsNode(0...35)(
     [CallOperatorWriteNode(0...10)(
        CallNode(0...5)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          (3...4),
          (4...5),
          nil,
@@ -19,7 +19,7 @@ ProgramNode(0...35)(
      ),
      CallOperatorWriteNode(12...22)(
        CallNode(12...17)(
-         CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "foo"),
+         CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
          (15...16),
          (16...17),
          nil,
@@ -35,7 +35,7 @@ ProgramNode(0...35)(
      ),
      CallOperatorWriteNode(24...35)(
        CallNode(24...30)(
-         CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 0, "foo"),
+         CallNode(24...27)(nil, nil, (24...27), nil, nil, nil, nil, 2, "foo"),
          (27...29),
          (29...30),
          nil,
diff --git a/test/snapshots/whitequark/op_asgn_cmd.txt b/test/snapshots/whitequark/op_asgn_cmd.txt
index e18088fc606..409aa26ee25 100644
--- a/test/snapshots/whitequark/op_asgn_cmd.txt
+++ b/test/snapshots/whitequark/op_asgn_cmd.txt
@@ -3,7 +3,7 @@ ProgramNode(0...64)(
   StatementsNode(0...64)(
     [CallOperatorWriteNode(0...14)(
        CallNode(0...5)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          (3...4),
          (4...5),
          nil,
@@ -28,7 +28,7 @@ ProgramNode(0...64)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -41,7 +41,7 @@ ProgramNode(0...64)(
      ),
      CallOperatorWriteNode(16...30)(
        CallNode(16...21)(
-         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "foo"),
+         CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
          (19...20),
          (20...21),
          nil,
@@ -66,7 +66,7 @@ ProgramNode(0...64)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -79,7 +79,7 @@ ProgramNode(0...64)(
      ),
      ConstantPathOperatorWriteNode(32...47)(
        ConstantPathNode(32...38)(
-         CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 0, "foo"),
+         CallNode(32...35)(nil, nil, (32...35), nil, nil, nil, nil, 2, "foo"),
          ConstantReadNode(37...38)(),
          (35...37)
        ),
@@ -98,7 +98,7 @@ ProgramNode(0...64)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -111,7 +111,7 @@ ProgramNode(0...64)(
      ),
      CallOperatorWriteNode(49...64)(
        CallNode(49...55)(
-         CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 0, "foo"),
+         CallNode(49...52)(nil, nil, (49...52), nil, nil, nil, nil, 2, "foo"),
          (52...54),
          (54...55),
          nil,
@@ -136,7 +136,7 @@ ProgramNode(0...64)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
diff --git a/test/snapshots/whitequark/op_asgn_index.txt b/test/snapshots/whitequark/op_asgn_index.txt
index 8e0bc5f7dcf..9b31652ca95 100644
--- a/test/snapshots/whitequark/op_asgn_index.txt
+++ b/test/snapshots/whitequark/op_asgn_index.txt
@@ -3,7 +3,7 @@ ProgramNode(0...14)(
   StatementsNode(0...14)(
     [CallOperatorWriteNode(0...14)(
        CallNode(0...9)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          nil,
          (3...9),
          (3...4),
diff --git a/test/snapshots/whitequark/op_asgn_index_cmd.txt b/test/snapshots/whitequark/op_asgn_index_cmd.txt
index c2e27b43537..031532b83fe 100644
--- a/test/snapshots/whitequark/op_asgn_index_cmd.txt
+++ b/test/snapshots/whitequark/op_asgn_index_cmd.txt
@@ -3,7 +3,7 @@ ProgramNode(0...18)(
   StatementsNode(0...18)(
     [CallOperatorWriteNode(0...18)(
        CallNode(0...9)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          nil,
          (3...9),
          (3...4),
@@ -28,7 +28,7 @@ ProgramNode(0...18)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
diff --git a/test/snapshots/whitequark/or.txt b/test/snapshots/whitequark/or.txt
index 023490e6d30..fb1599df1da 100644
--- a/test/snapshots/whitequark/or.txt
+++ b/test/snapshots/whitequark/or.txt
@@ -2,13 +2,13 @@ ProgramNode(0...22)(
   [],
   StatementsNode(0...22)(
     [OrNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "bar"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "bar"),
        (4...6)
      ),
      OrNode(12...22)(
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "foo"),
-       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 0, "bar"),
+       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "foo"),
+       CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar"),
        (16...18)
      )]
   )
diff --git a/test/snapshots/whitequark/or_asgn.txt b/test/snapshots/whitequark/or_asgn.txt
index 21cede138fd..35d7d76aa6e 100644
--- a/test/snapshots/whitequark/or_asgn.txt
+++ b/test/snapshots/whitequark/or_asgn.txt
@@ -3,7 +3,7 @@ ProgramNode(0...28)(
   StatementsNode(0...28)(
     [CallOperatorOrWriteNode(0...11)(
        CallNode(0...5)(
-         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+         CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
          (3...4),
          (4...5),
          nil,
@@ -18,7 +18,7 @@ ProgramNode(0...28)(
      ),
      CallOperatorOrWriteNode(13...28)(
        CallNode(13...22)(
-         CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo"),
+         CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
          nil,
          (16...22),
          (16...17),
diff --git a/test/snapshots/whitequark/parser_bug_525.txt b/test/snapshots/whitequark/parser_bug_525.txt
index e6fc74d2f6b..0b5c2a5a44f 100644
--- a/test/snapshots/whitequark/parser_bug_525.txt
+++ b/test/snapshots/whitequark/parser_bug_525.txt
@@ -18,7 +18,7 @@ ProgramNode(0...32)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "m2"
                ),
                (6...8)
diff --git a/test/snapshots/whitequark/parser_bug_604.txt b/test/snapshots/whitequark/parser_bug_604.txt
index 99f5a7a71a4..ff732e34c57 100644
--- a/test/snapshots/whitequark/parser_bug_604.txt
+++ b/test/snapshots/whitequark/parser_bug_604.txt
@@ -8,12 +8,12 @@ ProgramNode(0...14)(
        nil,
        ArgumentsNode(2...7)(
          [CallNode(2...7)(
-            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 0, "a"),
+            CallNode(2...3)(nil, nil, (2...3), nil, nil, nil, nil, 2, "a"),
             nil,
             (4...5),
             nil,
             ArgumentsNode(6...7)(
-              [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 0, "b")]
+              [CallNode(6...7)(nil, nil, (6...7), nil, nil, nil, nil, 2, "b")]
             ),
             nil,
             nil,
diff --git a/test/snapshots/whitequark/regex_interp.txt b/test/snapshots/whitequark/regex_interp.txt
index 2819567035f..d314875cc4c 100644
--- a/test/snapshots/whitequark/regex_interp.txt
+++ b/test/snapshots/whitequark/regex_interp.txt
@@ -7,7 +7,7 @@ ProgramNode(0...14)(
         EmbeddedStatementsNode(4...10)(
           (4...6),
           StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "bar")]
+            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
           ),
           (9...10)
         ),
diff --git a/test/snapshots/whitequark/resbody_list.txt b/test/snapshots/whitequark/resbody_list.txt
index 772a0a55f7a..a3f80a0f229 100644
--- a/test/snapshots/whitequark/resbody_list.txt
+++ b/test/snapshots/whitequark/resbody_list.txt
@@ -4,7 +4,7 @@ ProgramNode(0...39)(
     [BeginNode(0...39)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...34)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...39)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/resbody_list_mrhs.txt b/test/snapshots/whitequark/resbody_list_mrhs.txt
index 29e4ae792b6..4969f5929ba 100644
--- a/test/snapshots/whitequark/resbody_list_mrhs.txt
+++ b/test/snapshots/whitequark/resbody_list_mrhs.txt
@@ -4,7 +4,7 @@ ProgramNode(0...44)(
     [BeginNode(0...44)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...39)(
          (13...19),
@@ -17,7 +17,7 @@ ProgramNode(0...44)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           )],
          nil,
@@ -31,7 +31,7 @@ ProgramNode(0...44)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/resbody_list_var.txt b/test/snapshots/whitequark/resbody_list_var.txt
index aca812cd011..7552914e005 100644
--- a/test/snapshots/whitequark/resbody_list_var.txt
+++ b/test/snapshots/whitequark/resbody_list_var.txt
@@ -4,7 +4,7 @@ ProgramNode(0...39)(
     [BeginNode(0...39)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...34)(
          (13...19),
@@ -16,7 +16,7 @@ ProgramNode(0...39)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "foo"
           )],
          (24...26),
@@ -30,7 +30,7 @@ ProgramNode(0...39)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/resbody_var.txt b/test/snapshots/whitequark/resbody_var.txt
index 0acad7e908e..8e2d566c196 100644
--- a/test/snapshots/whitequark/resbody_var.txt
+++ b/test/snapshots/whitequark/resbody_var.txt
@@ -4,7 +4,7 @@ ProgramNode(0...73)(
     [BeginNode(0...36)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...31)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...73)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
@@ -41,7 +41,7 @@ ProgramNode(0...73)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "meth"
           )]
        ),
@@ -59,7 +59,7 @@ ProgramNode(0...73)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/rescue.txt b/test/snapshots/whitequark/rescue.txt
index ae9063361a0..6a14aa08032 100644
--- a/test/snapshots/whitequark/rescue.txt
+++ b/test/snapshots/whitequark/rescue.txt
@@ -4,7 +4,7 @@ ProgramNode(0...29)(
     [BeginNode(0...29)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...24)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...29)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
diff --git a/test/snapshots/whitequark/rescue_else.txt b/test/snapshots/whitequark/rescue_else.txt
index 4c4e9ab987e..5359bb2a626 100644
--- a/test/snapshots/whitequark/rescue_else.txt
+++ b/test/snapshots/whitequark/rescue_else.txt
@@ -4,7 +4,7 @@ ProgramNode(0...40)(
     [BeginNode(0...40)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...24)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...40)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -37,7 +37,7 @@ ProgramNode(0...40)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/rescue_else_ensure.txt b/test/snapshots/whitequark/rescue_else_ensure.txt
index 0d44b99b704..89fc1247846 100644
--- a/test/snapshots/whitequark/rescue_else_ensure.txt
+++ b/test/snapshots/whitequark/rescue_else_ensure.txt
@@ -4,7 +4,7 @@ ProgramNode(0...51)(
     [BeginNode(0...51)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...24)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...51)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -37,7 +37,7 @@ ProgramNode(0...51)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "foo"
             )]
          ),
@@ -54,7 +54,7 @@ ProgramNode(0...51)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/rescue_ensure.txt b/test/snapshots/whitequark/rescue_ensure.txt
index 6f9b287c1c7..719ed167fec 100644
--- a/test/snapshots/whitequark/rescue_ensure.txt
+++ b/test/snapshots/whitequark/rescue_ensure.txt
@@ -4,7 +4,7 @@ ProgramNode(0...42)(
     [BeginNode(0...42)(
        (0...5),
        StatementsNode(7...11)(
-         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth")]
        ),
        RescueNode(13...24)(
          (13...19),
@@ -20,7 +20,7 @@ ProgramNode(0...42)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -38,7 +38,7 @@ ProgramNode(0...42)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "bar"
             )]
          ),
diff --git a/test/snapshots/whitequark/rescue_mod.txt b/test/snapshots/whitequark/rescue_mod.txt
index baae026bb84..e755977e7de 100644
--- a/test/snapshots/whitequark/rescue_mod.txt
+++ b/test/snapshots/whitequark/rescue_mod.txt
@@ -2,9 +2,9 @@ ProgramNode(0...15)(
   [],
   StatementsNode(0...15)(
     [RescueModifierNode(0...15)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 0, "meth"),
+       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth"),
        (5...11),
-       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 0, "bar")
+       CallNode(12...15)(nil, nil, (12...15), nil, nil, nil, nil, 2, "bar")
      )]
   )
 )
diff --git a/test/snapshots/whitequark/rescue_mod_asgn.txt b/test/snapshots/whitequark/rescue_mod_asgn.txt
index 39ddc02f3bb..c0c1b20cef7 100644
--- a/test/snapshots/whitequark/rescue_mod_asgn.txt
+++ b/test/snapshots/whitequark/rescue_mod_asgn.txt
@@ -5,9 +5,9 @@ ProgramNode(0...21)(
        :foo,
        0,
        RescueModifierNode(6...21)(
-         CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 0, "meth"),
+         CallNode(6...10)(nil, nil, (6...10), nil, nil, nil, nil, 2, "meth"),
          (11...17),
-         CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 0, "bar")
+         CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar")
        ),
        (0...3),
        (4...5)
diff --git a/test/snapshots/whitequark/rescue_mod_masgn.txt b/test/snapshots/whitequark/rescue_mod_masgn.txt
index f027de1f737..60464244f58 100644
--- a/test/snapshots/whitequark/rescue_mod_masgn.txt
+++ b/test/snapshots/whitequark/rescue_mod_masgn.txt
@@ -6,7 +6,7 @@ ProgramNode(0...29)(
         LocalVariableWriteNode(5...8)(:bar, 0, nil, (5...8), nil)],
        (9...10),
        RescueModifierNode(11...29)(
-         CallNode(11...15)(nil, nil, (11...15), nil, nil, nil, nil, 0, "meth"),
+         CallNode(11...15)(nil, nil, (11...15), nil, nil, nil, nil, 2, "meth"),
          (16...22),
          ArrayNode(23...29)(
            [IntegerNode(24...25)(), IntegerNode(27...28)()],
diff --git a/test/snapshots/whitequark/rescue_mod_op_assign.txt b/test/snapshots/whitequark/rescue_mod_op_assign.txt
index 9f846f792e0..051ead127c0 100644
--- a/test/snapshots/whitequark/rescue_mod_op_assign.txt
+++ b/test/snapshots/whitequark/rescue_mod_op_assign.txt
@@ -5,9 +5,9 @@ ProgramNode(0...22)(
        (0...3),
        (4...6),
        RescueModifierNode(7...22)(
-         CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 0, "meth"),
+         CallNode(7...11)(nil, nil, (7...11), nil, nil, nil, nil, 2, "meth"),
          (12...18),
-         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 0, "bar")
+         CallNode(19...22)(nil, nil, (19...22), nil, nil, nil, nil, 2, "bar")
        ),
        :foo,
        :+
diff --git a/test/snapshots/whitequark/rescue_without_begin_end.txt b/test/snapshots/whitequark/rescue_without_begin_end.txt
index bc290f265b3..038219dc1fc 100644
--- a/test/snapshots/whitequark/rescue_without_begin_end.txt
+++ b/test/snapshots/whitequark/rescue_without_begin_end.txt
@@ -22,7 +22,7 @@ ProgramNode(0...30)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "foo"
               )]
            ),
@@ -40,7 +40,7 @@ ProgramNode(0...30)(
                   nil,
                   nil,
                   nil,
-                  0,
+                  2,
                   "bar"
                 )]
              ),
diff --git a/test/snapshots/whitequark/return.txt b/test/snapshots/whitequark/return.txt
index da8c8a6f0fb..0afc3de823e 100644
--- a/test/snapshots/whitequark/return.txt
+++ b/test/snapshots/whitequark/return.txt
@@ -5,7 +5,7 @@ ProgramNode(0...41)(
      ReturnNode(8...18)(
        (8...14),
        ArgumentsNode(15...18)(
-         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "foo")]
        )
      ),
      ReturnNode(20...28)(
@@ -27,7 +27,7 @@ ProgramNode(0...41)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/return_block.txt b/test/snapshots/whitequark/return_block.txt
index 87b2028abe7..60f24062954 100644
--- a/test/snapshots/whitequark/return_block.txt
+++ b/test/snapshots/whitequark/return_block.txt
@@ -18,7 +18,7 @@ ProgramNode(0...21)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "foo"
                )]
             ),
diff --git a/test/snapshots/whitequark/ruby_bug_11873.txt b/test/snapshots/whitequark/ruby_bug_11873.txt
index fa2e919f6ea..5c63deed085 100644
--- a/test/snapshots/whitequark/ruby_bug_11873.txt
+++ b/test/snapshots/whitequark/ruby_bug_11873.txt
@@ -27,7 +27,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -75,7 +75,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -129,7 +129,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -183,7 +183,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -231,7 +231,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -285,7 +285,7 @@ ProgramNode(0...272)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -344,7 +344,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -398,7 +398,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -458,7 +458,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -518,7 +518,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -572,7 +572,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -632,7 +632,7 @@ ProgramNode(0...272)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
diff --git a/test/snapshots/whitequark/ruby_bug_11873_a.txt b/test/snapshots/whitequark/ruby_bug_11873_a.txt
index 4cb06f16cd0..5cdffe39b18 100644
--- a/test/snapshots/whitequark/ruby_bug_11873_a.txt
+++ b/test/snapshots/whitequark/ruby_bug_11873_a.txt
@@ -27,7 +27,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -75,7 +75,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -123,7 +123,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -171,7 +171,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -219,7 +219,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -267,7 +267,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -315,7 +315,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -363,7 +363,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -411,7 +411,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -459,7 +459,7 @@ ProgramNode(0...444)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "d"
                     )]
                  ),
@@ -512,7 +512,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -566,7 +566,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -620,7 +620,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -674,7 +674,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -728,7 +728,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -782,7 +782,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -836,7 +836,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -890,7 +890,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -944,7 +944,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
@@ -998,7 +998,7 @@ ProgramNode(0...444)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "d"
                       )]
                    ),
diff --git a/test/snapshots/whitequark/ruby_bug_11873_b.txt b/test/snapshots/whitequark/ruby_bug_11873_b.txt
index b84ec0e5b1a..f1a840a8923 100644
--- a/test/snapshots/whitequark/ruby_bug_11873_b.txt
+++ b/test/snapshots/whitequark/ruby_bug_11873_b.txt
@@ -32,7 +32,7 @@ ProgramNode(0...25)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "p"
                       )]
                    ),
@@ -55,7 +55,7 @@ ProgramNode(0...25)(
                         nil,
                         nil,
                         nil,
-                        0,
+                        2,
                         "p"
                       )]
                    ),
@@ -71,7 +71,7 @@ ProgramNode(0...25)(
             0,
             "p"
           ),
-          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 0, "tap")]
+          CallNode(15...18)(nil, nil, (15...18), nil, nil, nil, nil, 2, "tap")]
        ),
        nil,
        BlockNode(19...25)([], nil, nil, (19...21), (22...25)),
diff --git a/test/snapshots/whitequark/ruby_bug_12402.txt b/test/snapshots/whitequark/ruby_bug_12402.txt
index f68c8dc46be..fb00d826a21 100644
--- a/test/snapshots/whitequark/ruby_bug_12402.txt
+++ b/test/snapshots/whitequark/ruby_bug_12402.txt
@@ -19,7 +19,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (17...23),
@@ -52,7 +52,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -85,7 +85,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (75...81),
@@ -118,7 +118,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -161,7 +161,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (135...141),
@@ -203,7 +203,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -245,7 +245,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (198...204),
@@ -287,7 +287,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -323,7 +323,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (263...269),
@@ -358,7 +358,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -399,7 +399,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (329...335),
@@ -441,7 +441,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
@@ -483,7 +483,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               ),
               (394...400),
@@ -525,7 +525,7 @@ ProgramNode(0...437)(
                 nil,
                 nil,
                 nil,
-                0,
+                2,
                 "bar"
               )]
            ),
diff --git a/test/snapshots/whitequark/ruby_bug_12686.txt b/test/snapshots/whitequark/ruby_bug_12686.txt
index 6e23f383551..f0ae6d10749 100644
--- a/test/snapshots/whitequark/ruby_bug_12686.txt
+++ b/test/snapshots/whitequark/ruby_bug_12686.txt
@@ -18,7 +18,7 @@ ProgramNode(0...16)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "g"
                  ),
                  (5...11),
diff --git a/test/snapshots/whitequark/ruby_bug_13547.txt b/test/snapshots/whitequark/ruby_bug_13547.txt
index 42592cfc6ad..c0e5ccd9271 100644
--- a/test/snapshots/whitequark/ruby_bug_13547.txt
+++ b/test/snapshots/whitequark/ruby_bug_13547.txt
@@ -2,7 +2,7 @@ ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
     [CallNode(0...9)(
-       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 0, "meth"),
+       CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth"),
        nil,
        (4...6),
        (4...5),
diff --git a/test/snapshots/whitequark/ruby_bug_14690.txt b/test/snapshots/whitequark/ruby_bug_14690.txt
index 65a6cb57377..743cf8b7b6e 100644
--- a/test/snapshots/whitequark/ruby_bug_14690.txt
+++ b/test/snapshots/whitequark/ruby_bug_14690.txt
@@ -26,7 +26,7 @@ ProgramNode(0...23)(
                    nil,
                    nil,
                    nil,
-                   0,
+                   2,
                    "a"
                  )]
               ),
diff --git a/test/snapshots/whitequark/ruby_bug_15789.txt b/test/snapshots/whitequark/ruby_bug_15789.txt
index 705992927f1..331c1e5cd85 100644
--- a/test/snapshots/whitequark/ruby_bug_15789.txt
+++ b/test/snapshots/whitequark/ruby_bug_15789.txt
@@ -30,7 +30,7 @@ ProgramNode(0...41)(
                           nil,
                           nil,
                           nil,
-                          0,
+                          2,
                           "_1"
                         )]
                      )
@@ -84,7 +84,7 @@ ProgramNode(0...41)(
                           nil,
                           nil,
                           nil,
-                          0,
+                          2,
                           "_1"
                         )]
                      )
diff --git a/test/snapshots/whitequark/sclass.txt b/test/snapshots/whitequark/sclass.txt
index 1f032b1cf0b..a8beb303ebf 100644
--- a/test/snapshots/whitequark/sclass.txt
+++ b/test/snapshots/whitequark/sclass.txt
@@ -5,7 +5,7 @@ ProgramNode(0...22)(
        [],
        (0...5),
        (6...8),
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 0, "foo"),
+       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(14...17)([NilNode(14...17)()]),
        (19...22)
      )]
diff --git a/test/snapshots/whitequark/send_attr_asgn.txt b/test/snapshots/whitequark/send_attr_asgn.txt
index a220143a977..9d70f90f9a5 100644
--- a/test/snapshots/whitequark/send_attr_asgn.txt
+++ b/test/snapshots/whitequark/send_attr_asgn.txt
@@ -2,7 +2,7 @@ ProgramNode(0...44)(
   [],
   StatementsNode(0...44)(
     [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (4...5),
        nil,
@@ -13,7 +13,7 @@ ProgramNode(0...44)(
        "A="
      ),
      CallNode(11...20)(
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
        (14...15),
        (15...16),
        nil,
@@ -25,7 +25,7 @@ ProgramNode(0...44)(
      ),
      ConstantPathWriteNode(22...32)(
        ConstantPathNode(22...28)(
-         CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 0, "foo"),
+         CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "foo"),
          ConstantReadNode(27...28)(),
          (25...27)
        ),
@@ -33,7 +33,7 @@ ProgramNode(0...44)(
        IntegerNode(31...32)()
      ),
      CallNode(34...44)(
-       CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 0, "foo"),
+       CallNode(34...37)(nil, nil, (34...37), nil, nil, nil, nil, 2, "foo"),
        (37...39),
        (39...40),
        nil,
diff --git a/test/snapshots/whitequark/send_attr_asgn_conditional.txt b/test/snapshots/whitequark/send_attr_asgn_conditional.txt
index fabbcb5ca70..a48f189f41a 100644
--- a/test/snapshots/whitequark/send_attr_asgn_conditional.txt
+++ b/test/snapshots/whitequark/send_attr_asgn_conditional.txt
@@ -2,7 +2,7 @@ ProgramNode(0...8)(
   [],
   StatementsNode(0...8)(
     [CallNode(0...8)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/whitequark/send_binary_op.txt b/test/snapshots/whitequark/send_binary_op.txt
index c8f2682cf1e..aadcb1fcb9d 100644
--- a/test/snapshots/whitequark/send_binary_op.txt
+++ b/test/snapshots/whitequark/send_binary_op.txt
@@ -2,7 +2,7 @@ ProgramNode(0...200)(
   [],
   StatementsNode(0...200)(
     [CallNode(0...8)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (4...6),
        nil,
@@ -13,7 +13,7 @@ ProgramNode(0...200)(
        "!="
      ),
      CallNode(10...18)(
-       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 0, "foo"),
+       CallNode(10...13)(nil, nil, (10...13), nil, nil, nil, nil, 2, "foo"),
        nil,
        (14...16),
        nil,
@@ -24,7 +24,7 @@ ProgramNode(0...200)(
        "!~"
      ),
      CallNode(20...27)(
-       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "foo"),
+       CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
        nil,
        (24...25),
        nil,
@@ -35,7 +35,7 @@ ProgramNode(0...200)(
        "%"
      ),
      CallNode(29...36)(
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 0, "foo"),
+       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
        nil,
        (33...34),
        nil,
@@ -46,7 +46,7 @@ ProgramNode(0...200)(
        "&"
      ),
      CallNode(38...45)(
-       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 0, "foo"),
+       CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "foo"),
        nil,
        (42...43),
        nil,
@@ -57,7 +57,7 @@ ProgramNode(0...200)(
        "*"
      ),
      CallNode(47...55)(
-       CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 0, "foo"),
+       CallNode(47...50)(nil, nil, (47...50), nil, nil, nil, nil, 2, "foo"),
        nil,
        (51...53),
        nil,
@@ -68,7 +68,7 @@ ProgramNode(0...200)(
        "**"
      ),
      CallNode(57...64)(
-       CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 0, "foo"),
+       CallNode(57...60)(nil, nil, (57...60), nil, nil, nil, nil, 2, "foo"),
        nil,
        (61...62),
        nil,
@@ -79,7 +79,7 @@ ProgramNode(0...200)(
        "+"
      ),
      CallNode(66...73)(
-       CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 0, "foo"),
+       CallNode(66...69)(nil, nil, (66...69), nil, nil, nil, nil, 2, "foo"),
        nil,
        (70...71),
        nil,
@@ -90,7 +90,7 @@ ProgramNode(0...200)(
        "-"
      ),
      CallNode(75...82)(
-       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 0, "foo"),
+       CallNode(75...78)(nil, nil, (75...78), nil, nil, nil, nil, 2, "foo"),
        nil,
        (79...80),
        nil,
@@ -101,7 +101,7 @@ ProgramNode(0...200)(
        "/"
      ),
      CallNode(84...91)(
-       CallNode(84...87)(nil, nil, (84...87), nil, nil, nil, nil, 0, "foo"),
+       CallNode(84...87)(nil, nil, (84...87), nil, nil, nil, nil, 2, "foo"),
        nil,
        (88...89),
        nil,
@@ -112,7 +112,7 @@ ProgramNode(0...200)(
        "<"
      ),
      CallNode(93...101)(
-       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 0, "foo"),
+       CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "foo"),
        nil,
        (97...99),
        nil,
@@ -131,7 +131,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -152,7 +152,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -173,7 +173,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -194,7 +194,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -215,7 +215,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -236,7 +236,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -257,7 +257,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -278,7 +278,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -299,7 +299,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
@@ -320,7 +320,7 @@ ProgramNode(0...200)(
          nil,
          nil,
          nil,
-         0,
+         2,
          "foo"
        ),
        nil,
diff --git a/test/snapshots/whitequark/send_block_chain_cmd.txt b/test/snapshots/whitequark/send_block_chain_cmd.txt
index 15e364b8295..35c6c466a6f 100644
--- a/test/snapshots/whitequark/send_block_chain_cmd.txt
+++ b/test/snapshots/whitequark/send_block_chain_cmd.txt
@@ -17,7 +17,7 @@ ProgramNode(0...173)(
        (14...17),
        nil,
        ArgumentsNode(18...21)(
-         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(18...21)(nil, nil, (18...21), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
@@ -40,7 +40,7 @@ ProgramNode(0...173)(
        (37...40),
        nil,
        ArgumentsNode(41...44)(
-         [CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(41...44)(nil, nil, (41...44), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        BlockNode(45...51)([], nil, nil, (45...47), (48...51)),
@@ -84,7 +84,7 @@ ProgramNode(0...173)(
        (89...92),
        (92...93),
        ArgumentsNode(93...96)(
-         [CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(93...96)(nil, nil, (93...96), nil, nil, nil, nil, 2, "bar")]
        ),
        (96...97),
        nil,
@@ -115,7 +115,7 @@ ProgramNode(0...173)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -148,7 +148,7 @@ ProgramNode(0...173)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
@@ -181,7 +181,7 @@ ProgramNode(0...173)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "bar"
           )]
        ),
diff --git a/test/snapshots/whitequark/send_block_conditional.txt b/test/snapshots/whitequark/send_block_conditional.txt
index a25fb4ac4eb..3ac7347f7ab 100644
--- a/test/snapshots/whitequark/send_block_conditional.txt
+++ b/test/snapshots/whitequark/send_block_conditional.txt
@@ -2,7 +2,7 @@ ProgramNode(0...11)(
   [],
   StatementsNode(0...11)(
     [CallNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...5),
        (5...8),
        nil,
diff --git a/test/snapshots/whitequark/send_call.txt b/test/snapshots/whitequark/send_call.txt
index 6c52bec0fe0..42803230780 100644
--- a/test/snapshots/whitequark/send_call.txt
+++ b/test/snapshots/whitequark/send_call.txt
@@ -2,7 +2,7 @@ ProgramNode(0...17)(
   [],
   StatementsNode(0...17)(
     [CallNode(0...7)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (0...0),
        (4...5),
@@ -13,7 +13,7 @@ ProgramNode(0...17)(
        "call"
      ),
      CallNode(9...17)(
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 0, "foo"),
+       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
        (12...14),
        (0...0),
        (14...15),
diff --git a/test/snapshots/whitequark/send_conditional.txt b/test/snapshots/whitequark/send_conditional.txt
index 1621715838b..d170db0f559 100644
--- a/test/snapshots/whitequark/send_conditional.txt
+++ b/test/snapshots/whitequark/send_conditional.txt
@@ -2,7 +2,7 @@ ProgramNode(0...4)(
   [],
   StatementsNode(0...4)(
     [CallNode(0...4)(
-       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+       CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
        (1...3),
        (3...4),
        nil,
diff --git a/test/snapshots/whitequark/send_index.txt b/test/snapshots/whitequark/send_index.txt
index f09270736f4..75f8c0ff876 100644
--- a/test/snapshots/whitequark/send_index.txt
+++ b/test/snapshots/whitequark/send_index.txt
@@ -2,7 +2,7 @@ ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
     [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...9),
        (3...4),
diff --git a/test/snapshots/whitequark/send_index_asgn.txt b/test/snapshots/whitequark/send_index_asgn.txt
index d6cfd22a29d..d38af8fb52c 100644
--- a/test/snapshots/whitequark/send_index_asgn.txt
+++ b/test/snapshots/whitequark/send_index_asgn.txt
@@ -2,7 +2,7 @@ ProgramNode(0...13)(
   [],
   StatementsNode(0...13)(
     [CallNode(0...13)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...9),
        (3...4),
diff --git a/test/snapshots/whitequark/send_index_asgn_legacy.txt b/test/snapshots/whitequark/send_index_asgn_legacy.txt
index d6cfd22a29d..d38af8fb52c 100644
--- a/test/snapshots/whitequark/send_index_asgn_legacy.txt
+++ b/test/snapshots/whitequark/send_index_asgn_legacy.txt
@@ -2,7 +2,7 @@ ProgramNode(0...13)(
   [],
   StatementsNode(0...13)(
     [CallNode(0...13)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...9),
        (3...4),
diff --git a/test/snapshots/whitequark/send_index_cmd.txt b/test/snapshots/whitequark/send_index_cmd.txt
index cf982040738..38c69392b3d 100644
--- a/test/snapshots/whitequark/send_index_cmd.txt
+++ b/test/snapshots/whitequark/send_index_cmd.txt
@@ -2,7 +2,7 @@ ProgramNode(0...10)(
   [],
   StatementsNode(0...10)(
     [CallNode(0...10)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...10),
        (3...4),
@@ -21,7 +21,7 @@ ProgramNode(0...10)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "bar"
                )]
             ),
diff --git a/test/snapshots/whitequark/send_index_legacy.txt b/test/snapshots/whitequark/send_index_legacy.txt
index f09270736f4..75f8c0ff876 100644
--- a/test/snapshots/whitequark/send_index_legacy.txt
+++ b/test/snapshots/whitequark/send_index_legacy.txt
@@ -2,7 +2,7 @@ ProgramNode(0...9)(
   [],
   StatementsNode(0...9)(
     [CallNode(0...9)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        nil,
        (3...9),
        (3...4),
diff --git a/test/snapshots/whitequark/send_op_asgn_conditional.txt b/test/snapshots/whitequark/send_op_asgn_conditional.txt
index db30a2a0ee2..8403b1c7afb 100644
--- a/test/snapshots/whitequark/send_op_asgn_conditional.txt
+++ b/test/snapshots/whitequark/send_op_asgn_conditional.txt
@@ -3,7 +3,7 @@ ProgramNode(0...10)(
   StatementsNode(0...10)(
     [CallOperatorAndWriteNode(0...10)(
        CallNode(0...4)(
-         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 0, "a"),
+         CallNode(0...1)(nil, nil, (0...1), nil, nil, nil, nil, 2, "a"),
          (1...3),
          (3...4),
          nil,
diff --git a/test/snapshots/whitequark/send_plain.txt b/test/snapshots/whitequark/send_plain.txt
index 892e30696c2..2272355126d 100644
--- a/test/snapshots/whitequark/send_plain.txt
+++ b/test/snapshots/whitequark/send_plain.txt
@@ -2,7 +2,7 @@ ProgramNode(0...29)(
   [],
   StatementsNode(0...29)(
     [CallNode(0...7)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (4...7),
        nil,
@@ -13,7 +13,7 @@ ProgramNode(0...29)(
        "fun"
      ),
      CallNode(9...19)(
-       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 0, "foo"),
+       CallNode(9...12)(nil, nil, (9...12), nil, nil, nil, nil, 2, "foo"),
        (12...14),
        (14...17),
        (17...18),
@@ -24,7 +24,7 @@ ProgramNode(0...29)(
        "Fun"
      ),
      CallNode(21...29)(
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "foo"),
+       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
        (24...26),
        (26...29),
        nil,
diff --git a/test/snapshots/whitequark/send_plain_cmd.txt b/test/snapshots/whitequark/send_plain_cmd.txt
index 0b13828cb44..93990bcc05b 100644
--- a/test/snapshots/whitequark/send_plain_cmd.txt
+++ b/test/snapshots/whitequark/send_plain_cmd.txt
@@ -2,12 +2,12 @@ ProgramNode(0...39)(
   [],
   StatementsNode(0...39)(
     [CallNode(0...11)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (4...7),
        nil,
        ArgumentsNode(8...11)(
-         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(8...11)(nil, nil, (8...11), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
@@ -15,12 +15,12 @@ ProgramNode(0...39)(
        "fun"
      ),
      CallNode(13...25)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo"),
+       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
        (16...18),
        (18...21),
        nil,
        ArgumentsNode(22...25)(
-         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(22...25)(nil, nil, (22...25), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
@@ -28,12 +28,12 @@ ProgramNode(0...39)(
        "Fun"
      ),
      CallNode(27...39)(
-       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 0, "foo"),
+       CallNode(27...30)(nil, nil, (27...30), nil, nil, nil, nil, 2, "foo"),
        (30...32),
        (36...39),
        nil,
        ArgumentsNode(36...39)(
-         [CallNode(36...39)(nil, nil, (36...39), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(36...39)(nil, nil, (36...39), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil,
diff --git a/test/snapshots/whitequark/send_self.txt b/test/snapshots/whitequark/send_self.txt
index e12291d277d..2593a1550ad 100644
--- a/test/snapshots/whitequark/send_self.txt
+++ b/test/snapshots/whitequark/send_self.txt
@@ -1,8 +1,8 @@
 ProgramNode(0...17)(
   [],
   StatementsNode(0...17)(
-    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "fun"),
-     CallNode(5...9)(nil, nil, (5...9), nil, nil, nil, nil, 0, "fun!"),
+    [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "fun"),
+     CallNode(5...9)(nil, nil, (5...9), nil, nil, nil, nil, 2, "fun!"),
      CallNode(11...17)(
        nil,
        nil,
diff --git a/test/snapshots/whitequark/send_unary_op.txt b/test/snapshots/whitequark/send_unary_op.txt
index 6e1a3315b96..6906d49ae0a 100644
--- a/test/snapshots/whitequark/send_unary_op.txt
+++ b/test/snapshots/whitequark/send_unary_op.txt
@@ -2,7 +2,7 @@ ProgramNode(0...16)(
   [],
   StatementsNode(0...16)(
     [CallNode(0...4)(
-       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 0, "foo"),
+       CallNode(1...4)(nil, nil, (1...4), nil, nil, nil, nil, 2, "foo"),
        nil,
        (0...1),
        nil,
@@ -13,7 +13,7 @@ ProgramNode(0...16)(
        "+@"
      ),
      CallNode(6...10)(
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
        nil,
        (6...7),
        nil,
@@ -24,7 +24,7 @@ ProgramNode(0...16)(
        "-@"
      ),
      CallNode(12...16)(
-       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo"),
+       CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo"),
        nil,
        (12...13),
        nil,
diff --git a/test/snapshots/whitequark/space_args_arg_block.txt b/test/snapshots/whitequark/space_args_arg_block.txt
index 4ac9d1d7e44..33e4d9d311c 100644
--- a/test/snapshots/whitequark/space_args_arg_block.txt
+++ b/test/snapshots/whitequark/space_args_arg_block.txt
@@ -2,7 +2,7 @@ ProgramNode(0...43)(
   [],
   StatementsNode(0...43)(
     [CallNode(0...14)(
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        (3...4),
        (4...7),
        nil,
@@ -19,7 +19,7 @@ ProgramNode(0...43)(
        "fun"
      ),
      CallNode(16...31)(
-       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "foo"),
+       CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "foo"),
        (19...21),
        (30...31),
        nil,
diff --git a/test/snapshots/whitequark/space_args_cmd.txt b/test/snapshots/whitequark/space_args_cmd.txt
index 289ef54f8cb..84493c09a94 100644
--- a/test/snapshots/whitequark/space_args_cmd.txt
+++ b/test/snapshots/whitequark/space_args_cmd.txt
@@ -23,7 +23,7 @@ ProgramNode(0...11)(
                       nil,
                       nil,
                       nil,
-                      0,
+                      2,
                       "bar"
                     )]
                  ),
diff --git a/test/snapshots/whitequark/string_interp.txt b/test/snapshots/whitequark/string_interp.txt
index 20a4555ae2a..cd41265c99b 100644
--- a/test/snapshots/whitequark/string_interp.txt
+++ b/test/snapshots/whitequark/string_interp.txt
@@ -7,7 +7,7 @@ ProgramNode(0...14)(
         EmbeddedStatementsNode(4...10)(
           (4...6),
           StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "bar")]
+            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
           ),
           (9...10)
         ),
diff --git a/test/snapshots/whitequark/super.txt b/test/snapshots/whitequark/super.txt
index 0724119add6..65eb72d5f5b 100644
--- a/test/snapshots/whitequark/super.txt
+++ b/test/snapshots/whitequark/super.txt
@@ -5,7 +5,7 @@ ProgramNode(0...30)(
        (0...5),
        nil,
        ArgumentsNode(6...9)(
-         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo")]
        ),
        nil,
        nil
@@ -15,7 +15,7 @@ ProgramNode(0...30)(
        (20...25),
        (25...26),
        ArgumentsNode(26...29)(
-         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(26...29)(nil, nil, (26...29), nil, nil, nil, nil, 2, "foo")]
        ),
        (29...30),
        nil
diff --git a/test/snapshots/whitequark/super_block.txt b/test/snapshots/whitequark/super_block.txt
index e2af525f24b..a26dad1b37b 100644
--- a/test/snapshots/whitequark/super_block.txt
+++ b/test/snapshots/whitequark/super_block.txt
@@ -8,8 +8,8 @@ ProgramNode(0...35)(
        (14...19),
        nil,
        ArgumentsNode(20...28)(
-         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 0, "foo"),
-          CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(20...23)(nil, nil, (20...23), nil, nil, nil, nil, 2, "foo"),
+          CallNode(25...28)(nil, nil, (25...28), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        BlockNode(29...35)([], nil, nil, (29...31), (32...35))
diff --git a/test/snapshots/whitequark/symbol_interp.txt b/test/snapshots/whitequark/symbol_interp.txt
index cc6da96739a..5fd0375ae6a 100644
--- a/test/snapshots/whitequark/symbol_interp.txt
+++ b/test/snapshots/whitequark/symbol_interp.txt
@@ -15,7 +15,7 @@ ProgramNode(0...15)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           ),
diff --git a/test/snapshots/whitequark/ternary.txt b/test/snapshots/whitequark/ternary.txt
index 58bccdd8bef..c975e93c7ef 100644
--- a/test/snapshots/whitequark/ternary.txt
+++ b/test/snapshots/whitequark/ternary.txt
@@ -3,7 +3,7 @@ ProgramNode(0...11)(
   StatementsNode(0...11)(
     [IfNode(0...11)(
        nil,
-       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "foo"),
+       CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(6...7)([IntegerNode(6...7)()]),
        ElseNode(8...11)(
          (8...9),
diff --git a/test/snapshots/whitequark/ternary_ambiguous_symbol.txt b/test/snapshots/whitequark/ternary_ambiguous_symbol.txt
index 012b77a3d23..245f8a07fe6 100644
--- a/test/snapshots/whitequark/ternary_ambiguous_symbol.txt
+++ b/test/snapshots/whitequark/ternary_ambiguous_symbol.txt
@@ -12,7 +12,7 @@ ProgramNode(0...13)(
        nil,
        ParenthesesNode(4...9)(
          StatementsNode(5...8)(
-           [CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo")]
+           [CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo")]
          ),
          (4...5),
          (8...9)
diff --git a/test/snapshots/whitequark/unless.txt b/test/snapshots/whitequark/unless.txt
index 291a636f995..2c0a7aa0625 100644
--- a/test/snapshots/whitequark/unless.txt
+++ b/test/snapshots/whitequark/unless.txt
@@ -3,18 +3,18 @@ ProgramNode(0...46)(
   StatementsNode(0...46)(
     [UnlessNode(0...24)(
        (0...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(16...19)(
-         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (21...24)
      ),
      UnlessNode(26...46)(
        (26...32),
-       CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 0, "foo"),
+       CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(38...41)(
-         [CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(38...41)(nil, nil, (38...41), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        (43...46)
diff --git a/test/snapshots/whitequark/unless_else.txt b/test/snapshots/whitequark/unless_else.txt
index a3564a0c296..d08e1294e1f 100644
--- a/test/snapshots/whitequark/unless_else.txt
+++ b/test/snapshots/whitequark/unless_else.txt
@@ -3,9 +3,9 @@ ProgramNode(0...66)(
   StatementsNode(0...66)(
     [UnlessNode(0...34)(
        (0...6),
-       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 0, "foo"),
+       CallNode(7...10)(nil, nil, (7...10), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(16...19)(
-         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(16...19)(nil, nil, (16...19), nil, nil, nil, nil, 2, "bar")]
        ),
        ElseNode(21...34)(
          (21...25),
@@ -18,7 +18,7 @@ ProgramNode(0...66)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
@@ -28,9 +28,9 @@ ProgramNode(0...66)(
      ),
      UnlessNode(36...66)(
        (36...42),
-       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 0, "foo"),
+       CallNode(43...46)(nil, nil, (43...46), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(48...51)(
-         [CallNode(48...51)(nil, nil, (48...51), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(48...51)(nil, nil, (48...51), nil, nil, nil, nil, 2, "bar")]
        ),
        ElseNode(53...66)(
          (53...57),
@@ -43,7 +43,7 @@ ProgramNode(0...66)(
               nil,
               nil,
               nil,
-              0,
+              2,
               "baz"
             )]
          ),
diff --git a/test/snapshots/whitequark/unless_mod.txt b/test/snapshots/whitequark/unless_mod.txt
index 37e4f488815..8f2306aa6cd 100644
--- a/test/snapshots/whitequark/unless_mod.txt
+++ b/test/snapshots/whitequark/unless_mod.txt
@@ -3,9 +3,9 @@ ProgramNode(0...14)(
   StatementsNode(0...14)(
     [UnlessNode(0...14)(
        (4...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...3)(
-         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 0, "bar")]
+         [CallNode(0...3)(nil, nil, (0...3), nil, nil, nil, nil, 2, "bar")]
        ),
        nil,
        nil
diff --git a/test/snapshots/whitequark/until.txt b/test/snapshots/whitequark/until.txt
index 46632a67344..b5891d98e28 100644
--- a/test/snapshots/whitequark/until.txt
+++ b/test/snapshots/whitequark/until.txt
@@ -3,7 +3,7 @@ ProgramNode(0...42)(
   StatementsNode(0...42)(
     [UntilNode(0...21)(
        (0...5),
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo"),
+       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(13...17)(
          [CallNode(13...17)(
             nil,
@@ -13,14 +13,14 @@ ProgramNode(0...42)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "meth"
           )]
        )
      ),
      UntilNode(23...42)(
        (23...28),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 0, "foo"),
+       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(34...38)(
          [CallNode(34...38)(
             nil,
@@ -30,7 +30,7 @@ ProgramNode(0...42)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "meth"
           )]
        )
diff --git a/test/snapshots/whitequark/until_mod.txt b/test/snapshots/whitequark/until_mod.txt
index 604dc3d9ec0..765289de6bf 100644
--- a/test/snapshots/whitequark/until_mod.txt
+++ b/test/snapshots/whitequark/until_mod.txt
@@ -3,9 +3,9 @@ ProgramNode(0...14)(
   StatementsNode(0...14)(
     [UntilNode(0...14)(
        (5...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...4)(
-         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth")]
        )
      )]
   )
diff --git a/test/snapshots/whitequark/until_post.txt b/test/snapshots/whitequark/until_post.txt
index 0c2a28ab5c4..3a05c8259e7 100644
--- a/test/snapshots/whitequark/until_post.txt
+++ b/test/snapshots/whitequark/until_post.txt
@@ -3,7 +3,7 @@ ProgramNode(0...24)(
   StatementsNode(0...24)(
     [UntilNode(0...24)(
        (15...20),
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "foo"),
+       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...14)(
          [BeginNode(0...14)(
             (0...5),
@@ -16,7 +16,7 @@ ProgramNode(0...24)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "meth"
                )]
             ),
diff --git a/test/snapshots/whitequark/when_multi.txt b/test/snapshots/whitequark/when_multi.txt
index d81232ad202..7a5c41f7479 100644
--- a/test/snapshots/whitequark/when_multi.txt
+++ b/test/snapshots/whitequark/when_multi.txt
@@ -2,7 +2,7 @@ ProgramNode(0...37)(
   [],
   StatementsNode(0...37)(
     [CaseNode(0...37)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(10...32)(
           (10...14),
           [StringNode(15...20)((15...16), (16...19), (19...20), "bar"),
@@ -16,7 +16,7 @@ ProgramNode(0...37)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
diff --git a/test/snapshots/whitequark/when_splat.txt b/test/snapshots/whitequark/when_splat.txt
index 428ea20d6e3..88d2115eb44 100644
--- a/test/snapshots/whitequark/when_splat.txt
+++ b/test/snapshots/whitequark/when_splat.txt
@@ -2,7 +2,7 @@ ProgramNode(0...43)(
   [],
   StatementsNode(0...43)(
     [CaseNode(0...43)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(10...27)(
           (10...14),
           [IntegerNode(15...16)(),
@@ -16,7 +16,7 @@ ProgramNode(0...43)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "baz"
              )
            )],
@@ -29,7 +29,7 @@ ProgramNode(0...43)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
@@ -46,7 +46,7 @@ ProgramNode(0...43)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "foo"
              )
            )],
diff --git a/test/snapshots/whitequark/when_then.txt b/test/snapshots/whitequark/when_then.txt
index 3880028b7f4..8c08e6d8e50 100644
--- a/test/snapshots/whitequark/when_then.txt
+++ b/test/snapshots/whitequark/when_then.txt
@@ -2,7 +2,7 @@ ProgramNode(0...34)(
   [],
   StatementsNode(0...34)(
     [CaseNode(0...34)(
-       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 0, "foo"),
+       CallNode(5...8)(nil, nil, (5...8), nil, nil, nil, nil, 2, "foo"),
        [WhenNode(10...29)(
           (10...14),
           [StringNode(15...20)((15...16), (16...19), (19...20), "bar")],
@@ -15,7 +15,7 @@ ProgramNode(0...34)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           )
diff --git a/test/snapshots/whitequark/while.txt b/test/snapshots/whitequark/while.txt
index 9cd21ff1540..528842d2612 100644
--- a/test/snapshots/whitequark/while.txt
+++ b/test/snapshots/whitequark/while.txt
@@ -3,7 +3,7 @@ ProgramNode(0...42)(
   StatementsNode(0...42)(
     [WhileNode(0...21)(
        (0...5),
-       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "foo"),
+       CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(13...17)(
          [CallNode(13...17)(
             nil,
@@ -13,14 +13,14 @@ ProgramNode(0...42)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "meth"
           )]
        )
      ),
      WhileNode(23...42)(
        (23...28),
-       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 0, "foo"),
+       CallNode(29...32)(nil, nil, (29...32), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(34...38)(
          [CallNode(34...38)(
             nil,
@@ -30,7 +30,7 @@ ProgramNode(0...42)(
             nil,
             nil,
             nil,
-            0,
+            2,
             "meth"
           )]
        )
diff --git a/test/snapshots/whitequark/while_mod.txt b/test/snapshots/whitequark/while_mod.txt
index b39baf15c12..fee3d008f24 100644
--- a/test/snapshots/whitequark/while_mod.txt
+++ b/test/snapshots/whitequark/while_mod.txt
@@ -3,9 +3,9 @@ ProgramNode(0...14)(
   StatementsNode(0...14)(
     [WhileNode(0...14)(
        (5...10),
-       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 0, "foo"),
+       CallNode(11...14)(nil, nil, (11...14), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...4)(
-         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 0, "meth")]
+         [CallNode(0...4)(nil, nil, (0...4), nil, nil, nil, nil, 2, "meth")]
        )
      )]
   )
diff --git a/test/snapshots/whitequark/while_post.txt b/test/snapshots/whitequark/while_post.txt
index 94adefedc72..264603c51c9 100644
--- a/test/snapshots/whitequark/while_post.txt
+++ b/test/snapshots/whitequark/while_post.txt
@@ -3,7 +3,7 @@ ProgramNode(0...24)(
   StatementsNode(0...24)(
     [WhileNode(0...24)(
        (15...20),
-       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 0, "foo"),
+       CallNode(21...24)(nil, nil, (21...24), nil, nil, nil, nil, 2, "foo"),
        StatementsNode(0...14)(
          [BeginNode(0...14)(
             (0...5),
@@ -16,7 +16,7 @@ ProgramNode(0...24)(
                  nil,
                  nil,
                  nil,
-                 0,
+                 2,
                  "meth"
                )]
             ),
diff --git a/test/snapshots/whitequark/xstring_interp.txt b/test/snapshots/whitequark/xstring_interp.txt
index 0b7c91cf7f1..39d4a12c983 100644
--- a/test/snapshots/whitequark/xstring_interp.txt
+++ b/test/snapshots/whitequark/xstring_interp.txt
@@ -7,7 +7,7 @@ ProgramNode(0...14)(
         EmbeddedStatementsNode(4...10)(
           (4...6),
           StatementsNode(6...9)(
-            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 0, "bar")]
+            [CallNode(6...9)(nil, nil, (6...9), nil, nil, nil, nil, 2, "bar")]
           ),
           (9...10)
         ),
diff --git a/test/snapshots/whitequark/yield.txt b/test/snapshots/whitequark/yield.txt
index 89b53914b6a..ae0c2140a3d 100644
--- a/test/snapshots/whitequark/yield.txt
+++ b/test/snapshots/whitequark/yield.txt
@@ -6,7 +6,7 @@ ProgramNode(0...37)(
        (7...12),
        nil,
        ArgumentsNode(13...16)(
-         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(13...16)(nil, nil, (13...16), nil, nil, nil, nil, 2, "foo")]
        ),
        nil
      ),
@@ -15,7 +15,7 @@ ProgramNode(0...37)(
        (27...32),
        (32...33),
        ArgumentsNode(33...36)(
-         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 0, "foo")]
+         [CallNode(33...36)(nil, nil, (33...36), nil, nil, nil, nil, 2, "foo")]
        ),
        (36...37)
      )]
diff --git a/test/snapshots/xstring.txt b/test/snapshots/xstring.txt
index 5bc0e9be56c..fe7d5de5a0a 100644
--- a/test/snapshots/xstring.txt
+++ b/test/snapshots/xstring.txt
@@ -16,7 +16,7 @@ ProgramNode(0...40)(
                nil,
                nil,
                nil,
-               0,
+               2,
                "bar"
              )]
           ),