diff --git a/grammar.js b/grammar.js
index 35aff504..088c2fca 100644
--- a/grammar.js
+++ b/grammar.js
@@ -159,7 +159,7 @@ module.exports = grammar({
         seq(
           field('parameters', alias($.parameters, $.method_parameters)),
           choice(
-            seq(optional($._terminator), optional(field('method_body', $.body_statement)), 'end'),
+            seq(optional($._terminator), optional(field('body', $.body_statement)), 'end'),
             $._body_expr
           )
 
@@ -169,7 +169,7 @@ module.exports = grammar({
             field('parameters', alias($.bare_parameters, $.method_parameters))
           ),
           $._terminator,
-          optional(field('method_body', $.body_statement)),
+          optional(field('body', $.body_statement)),
           'end'
         ),
       ),
@@ -266,7 +266,7 @@ module.exports = grammar({
       field('name', choice($.constant, $.scope_resolution)),
       field('superclass', optional($.superclass)),
       $._terminator,
-      optional(field('namespace_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 
@@ -282,7 +282,7 @@ module.exports = grammar({
       alias($._singleton_class_left_angle_left_langle, '<<'),
       field('value', $._arg),
       $._terminator,
-      optional(field('namespace_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 
@@ -290,7 +290,7 @@ module.exports = grammar({
       'module',
       field('name', choice($.constant, $.scope_resolution)),
       choice(
-        seq($._terminator, optional(field('namespace_body', $.body_statement)), 'end'),
+        seq($._terminator, optional(field('body', $.body_statement)), 'end'),
         'end'
       )
     ),
@@ -830,7 +830,7 @@ module.exports = grammar({
         field('parameters', $.block_parameters),
         optional($._terminator)
       )),
-      optional(field('do_block_body', $.body_statement)),
+      optional(field('body', $.body_statement)),
       'end'
     ),
 
diff --git a/src/grammar.json b/src/grammar.json
index ca715fd2..b22c2fa0 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -341,7 +341,7 @@
                           "members": [
                             {
                               "type": "FIELD",
-                              "name": "method_body",
+                              "name": "body",
                               "content": {
                                 "type": "SYMBOL",
                                 "name": "body_statement"
@@ -399,7 +399,7 @@
                   "members": [
                     {
                       "type": "FIELD",
-                      "name": "method_body",
+                      "name": "body",
                       "content": {
                         "type": "SYMBOL",
                         "name": "body_statement"
@@ -954,7 +954,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "namespace_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"
@@ -1088,7 +1088,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "namespace_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"
@@ -1144,7 +1144,7 @@
                   "members": [
                     {
                       "type": "FIELD",
-                      "name": "namespace_body",
+                      "name": "body",
                       "content": {
                         "type": "SYMBOL",
                         "name": "body_statement"
@@ -4905,7 +4905,7 @@
           "members": [
             {
               "type": "FIELD",
-              "name": "do_block_body",
+              "name": "body",
               "content": {
                 "type": "SYMBOL",
                 "name": "body_statement"
diff --git a/src/node-types.json b/src/node-types.json
index 44ebc6ab..d64d064c 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -1380,26 +1380,26 @@
     "type": "class",
     "named": true,
     "fields": {
-      "name": {
+      "body": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": "constant",
-            "named": true
-          },
-          {
-            "type": "scope_resolution",
+            "type": "body_statement",
             "named": true
           }
         ]
       },
-      "namespace_body": {
+      "name": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "body_statement",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
             "named": true
           }
         ]
@@ -1596,7 +1596,7 @@
     "type": "do_block",
     "named": true,
     "fields": {
-      "do_block_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -2338,7 +2338,7 @@
     "type": "method",
     "named": true,
     "fields": {
-      "method_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -2435,26 +2435,26 @@
     "type": "module",
     "named": true,
     "fields": {
-      "name": {
+      "body": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": "constant",
-            "named": true
-          },
-          {
-            "type": "scope_resolution",
+            "type": "body_statement",
             "named": true
           }
         ]
       },
-      "namespace_body": {
+      "name": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "body_statement",
+            "type": "constant",
+            "named": true
+          },
+          {
+            "type": "scope_resolution",
             "named": true
           }
         ]
@@ -2995,7 +2995,7 @@
     "type": "singleton_class",
     "named": true,
     "fields": {
-      "namespace_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
@@ -3021,7 +3021,7 @@
     "type": "singleton_method",
     "named": true,
     "fields": {
-      "method_body": {
+      "body": {
         "multiple": false,
         "required": false,
         "types": [
diff --git a/src/parser.c b/src/parser.c
index f671c917..aa865510 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -20,9 +20,9 @@
 #define ALIAS_COUNT 4
 #define TOKEN_COUNT 155
 #define EXTERNAL_TOKEN_COUNT 29
-#define FIELD_COUNT 35
+#define FIELD_COUNT 32
 #define MAX_ALIAS_SEQUENCE_LENGTH 8
-#define PRODUCTION_ID_COUNT 119
+#define PRODUCTION_ID_COUNT 117
 
 enum {
   sym_identifier = 1,
@@ -2490,30 +2490,27 @@ enum {
   field_clauses = 9,
   field_condition = 10,
   field_consequence = 11,
-  field_do_block_body = 12,
-  field_else = 13,
-  field_end = 14,
-  field_exceptions = 15,
-  field_guard = 16,
-  field_handler = 17,
-  field_key = 18,
-  field_left = 19,
-  field_locals = 20,
-  field_method = 21,
-  field_method_body = 22,
-  field_name = 23,
-  field_namespace_body = 24,
-  field_object = 25,
-  field_operand = 26,
-  field_operator = 27,
-  field_parameters = 28,
-  field_pattern = 29,
-  field_receiver = 30,
-  field_right = 31,
-  field_scope = 32,
-  field_superclass = 33,
-  field_value = 34,
-  field_variable = 35,
+  field_else = 12,
+  field_end = 13,
+  field_exceptions = 14,
+  field_guard = 15,
+  field_handler = 16,
+  field_key = 17,
+  field_left = 18,
+  field_locals = 19,
+  field_method = 20,
+  field_name = 21,
+  field_object = 22,
+  field_operand = 23,
+  field_operator = 24,
+  field_parameters = 25,
+  field_pattern = 26,
+  field_receiver = 27,
+  field_right = 28,
+  field_scope = 29,
+  field_superclass = 30,
+  field_value = 31,
+  field_variable = 32,
 };
 
 static const char * const ts_field_names[] = {
@@ -2529,7 +2526,6 @@ static const char * const ts_field_names[] = {
   [field_clauses] = "clauses",
   [field_condition] = "condition",
   [field_consequence] = "consequence",
-  [field_do_block_body] = "do_block_body",
   [field_else] = "else",
   [field_end] = "end",
   [field_exceptions] = "exceptions",
@@ -2539,9 +2535,7 @@ static const char * const ts_field_names[] = {
   [field_left] = "left",
   [field_locals] = "locals",
   [field_method] = "method",
-  [field_method_body] = "method_body",
   [field_name] = "name",
-  [field_namespace_body] = "namespace_body",
   [field_object] = "object",
   [field_operand] = "operand",
   [field_operator] = "operator",
@@ -2608,53 +2602,51 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [68] = {.index = 103, .length = 2},
   [69] = {.index = 105, .length = 1},
   [70] = {.index = 106, .length = 1},
-  [71] = {.index = 107, .length = 1},
-  [72] = {.index = 108, .length = 2},
-  [73] = {.index = 110, .length = 4},
-  [74] = {.index = 114, .length = 3},
-  [75] = {.index = 117, .length = 2},
-  [76] = {.index = 119, .length = 1},
-  [77] = {.index = 120, .length = 2},
-  [78] = {.index = 122, .length = 2},
-  [79] = {.index = 124, .length = 3},
-  [80] = {.index = 127, .length = 2},
-  [81] = {.index = 129, .length = 3},
-  [82] = {.index = 132, .length = 2},
-  [83] = {.index = 134, .length = 2},
-  [85] = {.index = 136, .length = 2},
-  [86] = {.index = 138, .length = 2},
-  [87] = {.index = 140, .length = 3},
-  [88] = {.index = 143, .length = 3},
-  [89] = {.index = 146, .length = 2},
-  [90] = {.index = 43, .length = 2},
-  [91] = {.index = 148, .length = 2},
-  [92] = {.index = 150, .length = 1},
-  [93] = {.index = 151, .length = 1},
-  [94] = {.index = 152, .length = 3},
-  [95] = {.index = 155, .length = 4},
-  [96] = {.index = 159, .length = 3},
-  [97] = {.index = 162, .length = 2},
-  [98] = {.index = 164, .length = 3},
-  [99] = {.index = 167, .length = 3},
-  [100] = {.index = 170, .length = 2},
+  [71] = {.index = 107, .length = 2},
+  [72] = {.index = 109, .length = 4},
+  [73] = {.index = 113, .length = 3},
+  [74] = {.index = 116, .length = 2},
+  [75] = {.index = 118, .length = 1},
+  [76] = {.index = 119, .length = 2},
+  [77] = {.index = 121, .length = 2},
+  [78] = {.index = 123, .length = 3},
+  [79] = {.index = 126, .length = 2},
+  [80] = {.index = 128, .length = 3},
+  [81] = {.index = 131, .length = 2},
+  [82] = {.index = 133, .length = 2},
+  [84] = {.index = 135, .length = 2},
+  [85] = {.index = 137, .length = 2},
+  [86] = {.index = 139, .length = 3},
+  [87] = {.index = 142, .length = 3},
+  [88] = {.index = 145, .length = 2},
+  [89] = {.index = 43, .length = 2},
+  [90] = {.index = 147, .length = 1},
+  [91] = {.index = 148, .length = 1},
+  [92] = {.index = 149, .length = 3},
+  [93] = {.index = 152, .length = 4},
+  [94] = {.index = 156, .length = 3},
+  [95] = {.index = 159, .length = 2},
+  [96] = {.index = 161, .length = 3},
+  [97] = {.index = 164, .length = 3},
+  [98] = {.index = 167, .length = 2},
+  [99] = {.index = 169, .length = 2},
+  [100] = {.index = 171, .length = 1},
   [101] = {.index = 172, .length = 2},
   [102] = {.index = 174, .length = 1},
-  [103] = {.index = 175, .length = 2},
-  [104] = {.index = 177, .length = 1},
-  [105] = {.index = 178, .length = 3},
-  [106] = {.index = 181, .length = 1},
-  [107] = {.index = 182, .length = 2},
-  [108] = {.index = 184, .length = 2},
-  [109] = {.index = 186, .length = 1},
-  [110] = {.index = 187, .length = 1},
-  [111] = {.index = 188, .length = 2},
-  [112] = {.index = 190, .length = 2},
-  [113] = {.index = 192, .length = 2},
+  [103] = {.index = 175, .length = 3},
+  [104] = {.index = 178, .length = 1},
+  [105] = {.index = 179, .length = 2},
+  [106] = {.index = 181, .length = 2},
+  [107] = {.index = 183, .length = 1},
+  [108] = {.index = 184, .length = 1},
+  [109] = {.index = 185, .length = 2},
+  [110] = {.index = 187, .length = 2},
+  [111] = {.index = 189, .length = 2},
+  [112] = {.index = 191, .length = 2},
+  [113] = {.index = 193, .length = 1},
   [114] = {.index = 194, .length = 2},
   [115] = {.index = 196, .length = 1},
   [116] = {.index = 197, .length = 2},
-  [117] = {.index = 199, .length = 1},
-  [118] = {.index = 200, .length = 2},
 };
 
 static const TSFieldMapEntry ts_field_map_entries[] = {
@@ -2679,7 +2671,7 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_operator, 1, .inherited = true},
     {field_right, 1, .inherited = true},
   [14] =
-    {field_method_body, 1, .inherited = true},
+    {field_body, 1, .inherited = true},
     {field_name, 1, .inherited = true},
     {field_parameters, 1, .inherited = true},
   [17] =
@@ -2769,7 +2761,7 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_key, 0},
     {field_value, 2},
   [76] =
-    {field_method_body, 3, .inherited = true},
+    {field_body, 3, .inherited = true},
     {field_name, 3, .inherited = true},
     {field_object, 1},
     {field_parameters, 3, .inherited = true},
@@ -2816,144 +2808,139 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
   [106] =
     {field_parameters, 1},
   [107] =
-    {field_do_block_body, 1},
-  [108] =
     {field_name, 0},
     {field_value, 2},
-  [110] =
+  [109] =
     {field_arguments, 2},
     {field_block, 3},
     {field_operator, 1},
     {field_receiver, 0},
-  [114] =
-    {field_method_body, 2},
+  [113] =
+    {field_body, 2},
     {field_name, 0},
     {field_parameters, 1},
-  [117] =
-    {field_method_body, 2},
+  [116] =
+    {field_body, 2},
     {field_name, 0},
-  [119] =
+  [118] =
     {field_value, 2},
-  [120] =
+  [119] =
     {field_name, 1},
     {field_superclass, 2},
-  [122] =
+  [121] =
+    {field_body, 3},
     {field_name, 1},
-    {field_namespace_body, 3},
-  [124] =
+  [123] =
     {field_alternative, 3},
     {field_condition, 1},
     {field_consequence, 2},
-  [127] =
+  [126] =
     {field_alternative, 3},
     {field_condition, 1},
-  [129] =
+  [128] =
     {field_body, 3},
     {field_pattern, 1},
     {field_pattern, 2, .inherited = true},
-  [132] =
+  [131] =
     {field_pattern, 1},
     {field_pattern, 2, .inherited = true},
-  [134] =
+  [133] =
     {field_pattern, 0, .inherited = true},
     {field_pattern, 1, .inherited = true},
-  [136] =
+  [135] =
     {field_alternatives, 0},
     {field_alternatives, 1, .inherited = true},
-  [138] =
+  [137] =
     {field_clauses, 3, .inherited = true},
     {field_value, 1},
-  [140] =
+  [139] =
     {field_clauses, 2, .inherited = true},
     {field_else, 3},
     {field_value, 1},
-  [143] =
+  [142] =
     {field_body, 3},
     {field_exceptions, 1},
     {field_variable, 2},
-  [146] =
+  [145] =
     {field_exceptions, 1},
     {field_variable, 2},
-  [148] =
-    {field_do_block_body, 2},
-    {field_parameters, 1},
-  [150] =
+  [147] =
     {field_parameters, 2},
-  [151] =
-    {field_do_block_body, 2},
-  [152] =
+  [148] =
+    {field_body, 2},
+  [149] =
     {field_alternative, 4},
     {field_condition, 0},
     {field_consequence, 2},
-  [155] =
-    {field_method_body, 5, .inherited = true},
+  [152] =
+    {field_body, 5, .inherited = true},
     {field_name, 5, .inherited = true},
     {field_object, 2},
     {field_parameters, 5, .inherited = true},
-  [159] =
-    {field_method_body, 3},
+  [156] =
+    {field_body, 3},
     {field_name, 0},
     {field_parameters, 1},
-  [162] =
-    {field_namespace_body, 4},
+  [159] =
+    {field_body, 4},
     {field_value, 2},
-  [164] =
+  [161] =
+    {field_body, 4},
     {field_name, 1},
-    {field_namespace_body, 4},
     {field_superclass, 2},
-  [167] =
+  [164] =
     {field_body, 3},
     {field_guard, 2},
     {field_pattern, 1},
-  [170] =
+  [167] =
     {field_guard, 2},
     {field_pattern, 1},
-  [172] =
+  [169] =
     {field_name, 2},
     {field_value, 0},
-  [174] =
+  [171] =
     {field_alternatives, 1},
-  [175] =
+  [172] =
     {field_alternatives, 0, .inherited = true},
     {field_alternatives, 1, .inherited = true},
-  [177] =
+  [174] =
     {field_class, 0},
-  [178] =
+  [175] =
     {field_clauses, 3, .inherited = true},
     {field_else, 4},
     {field_value, 1},
-  [181] =
+  [178] =
     {field_locals, 2},
-  [182] =
-    {field_do_block_body, 3},
+  [179] =
+    {field_body, 3},
     {field_parameters, 1},
-  [184] =
-    {field_do_block_body, 3},
+  [181] =
+    {field_body, 3},
     {field_parameters, 2},
-  [186] =
+  [183] =
     {field_locals, 3},
-  [187] =
+  [184] =
     {field_locals, 1},
-  [188] =
+  [185] =
     {field_locals, 2},
     {field_locals, 3, .inherited = true},
-  [190] =
+  [187] =
     {field_locals, 0, .inherited = true},
     {field_locals, 1, .inherited = true},
-  [192] =
-    {field_do_block_body, 4},
+  [189] =
+    {field_body, 4},
     {field_parameters, 2},
-  [194] =
+  [191] =
     {field_locals, 3},
     {field_locals, 4, .inherited = true},
-  [196] =
+  [193] =
     {field_locals, 4},
-  [197] =
+  [194] =
     {field_locals, 4},
     {field_locals, 5, .inherited = true},
-  [199] =
+  [196] =
     {field_locals, 5},
-  [200] =
+  [197] =
     {field_locals, 5},
     {field_locals, 6, .inherited = true},
 };
@@ -3026,7 +3013,7 @@ static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE
   [61] = {
     [0] = sym_hash_pattern,
   },
-  [84] = {
+  [83] = {
     [1] = sym_splat_parameter,
   },
 };
@@ -447759,7 +447746,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4848),
   [1287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2770),
   [1289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rescue, 3, .production_id = 67),
-  [1291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rescue, 4, .production_id = 89),
+  [1291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rescue, 4, .production_id = 88),
   [1293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1102),
   [1295] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1102),
   [1297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1482),
@@ -447784,8 +447771,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1335] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1635),
   [1337] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1108),
   [1339] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4852),
-  [1341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_in_clause, 4, .production_id = 100),
-  [1343] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_when, 4, .production_id = 82),
+  [1341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_in_clause, 4, .production_id = 98),
+  [1343] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_when, 4, .production_id = 81),
   [1345] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2870),
   [1347] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_ensure, 1),
   [1349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4481),
@@ -448489,9 +448476,9 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
   [2748] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
   [2750] = {.entry = {.count = 1, .reusable = false}}, SHIFT(4704),
-  [2752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__array_pattern_n, 2, .production_id = 84),
+  [2752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__array_pattern_n, 2, .production_id = 83),
   [2754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4839),
-  [2756] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__array_pattern_n, 2, .production_id = 84),
+  [2756] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__array_pattern_n, 2, .production_id = 83),
   [2758] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4415),
   [2760] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__statements_repeat1, 1),
   [2762] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__statements_repeat1, 1),
@@ -448520,32 +448507,32 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2808] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_element_reference, 4, .production_id = 41),
   [2810] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parameters, 2),
   [2812] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2),
-  [2814] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 7, .production_id = 116),
-  [2816] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 7, .production_id = 116),
-  [2818] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 4, .production_id = 106),
-  [2820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 4, .production_id = 106),
+  [2814] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 7, .production_id = 114),
+  [2816] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 7, .production_id = 114),
+  [2818] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 4, .production_id = 104),
+  [2820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 4, .production_id = 104),
   [2822] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 5),
   [2824] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 5),
-  [2826] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 6, .production_id = 114),
-  [2828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 6, .production_id = 114),
+  [2826] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 6, .production_id = 112),
+  [2828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 6, .production_id = 112),
   [2830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__primary, 1),
   [2832] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__primary, 1),
   [2834] = {.entry = {.count = 1, .reusable = false}}, SHIFT(776),
   [2836] = {.entry = {.count = 1, .reusable = true}}, SHIFT(908),
   [2838] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 3),
   [2840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 3),
-  [2842] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 8, .production_id = 118),
-  [2844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 8, .production_id = 118),
-  [2846] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 5, .production_id = 111),
-  [2848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 5, .production_id = 111),
-  [2850] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 6, .production_id = 115),
-  [2852] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 6, .production_id = 115),
-  [2854] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 7, .production_id = 117),
-  [2856] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 7, .production_id = 117),
+  [2842] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 8, .production_id = 116),
+  [2844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 8, .production_id = 116),
+  [2846] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 5, .production_id = 109),
+  [2848] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 5, .production_id = 109),
+  [2850] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 6, .production_id = 113),
+  [2852] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 6, .production_id = 113),
+  [2854] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 7, .production_id = 115),
+  [2856] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 7, .production_id = 115),
   [2858] = {.entry = {.count = 1, .reusable = false}}, SHIFT(446),
   [2860] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
-  [2862] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 5, .production_id = 109),
-  [2864] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 5, .production_id = 109),
+  [2862] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 5, .production_id = 107),
+  [2864] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameters, 5, .production_id = 107),
   [2866] = {.entry = {.count = 1, .reusable = false}}, SHIFT(818),
   [2868] = {.entry = {.count = 1, .reusable = true}}, SHIFT(867),
   [2870] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameters, 4),
@@ -448645,10 +448632,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3059] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_chained_string_repeat1, 1),
   [3061] = {.entry = {.count = 1, .reusable = false}}, SHIFT(441),
   [3063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497),
-  [3065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 3, .production_id = 71),
-  [3067] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 3, .production_id = 71),
-  [3069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_class, 5, .production_id = 76),
-  [3071] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_class, 5, .production_id = 76),
+  [3065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 3, .production_id = 16),
+  [3067] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 3, .production_id = 16),
+  [3069] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_class, 5, .production_id = 75),
+  [3071] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_class, 5, .production_id = 75),
   [3073] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, .production_id = 19),
   [3075] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, .production_id = 19),
   [3077] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_array, 4, .production_id = 27),
@@ -448677,12 +448664,12 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3123] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_hash, 2),
   [3125] = {.entry = {.count = 1, .reusable = false}}, SHIFT(786),
   [3127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(868),
-  [3129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 107),
-  [3131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 107),
+  [3129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 105),
+  [3131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 105),
   [3133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__body_statement, 2),
   [3135] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__body_statement, 2),
-  [3137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 108),
-  [3139] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 108),
+  [3137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 106),
+  [3139] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 106),
   [3141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 3, .production_id = 53),
   [3143] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 3, .production_id = 53),
   [3145] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 2),
@@ -448695,14 +448682,14 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3159] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 4, .production_id = 14),
   [3161] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 4, .production_id = 14),
   [3163] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 4, .production_id = 14),
-  [3165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 92),
-  [3167] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 92),
+  [3165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 5, .production_id = 90),
+  [3167] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 5, .production_id = 90),
   [3169] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 3),
   [3171] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 3),
   [3173] = {.entry = {.count = 1, .reusable = false}}, SHIFT(424),
   [3175] = {.entry = {.count = 1, .reusable = true}}, SHIFT(478),
-  [3177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 6, .production_id = 98),
-  [3179] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 6, .production_id = 98),
+  [3177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 6, .production_id = 96),
+  [3179] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 6, .production_id = 96),
   [3181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__arg, 1, .production_id = 1),
   [3183] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__arg, 1, .production_id = 1),
   [3185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__arg, 1),
@@ -448719,36 +448706,36 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3207] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_array, 4, .production_id = 26),
   [3209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__primary, 1, .production_id = 5),
   [3211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__primary, 1, .production_id = 5),
-  [3213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_class, 6, .production_id = 97),
-  [3215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_class, 6, .production_id = 97),
-  [3217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 5, .production_id = 96),
-  [3219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 5, .production_id = 96),
+  [3213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_class, 6, .production_id = 95),
+  [3215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_class, 6, .production_id = 95),
+  [3217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 5, .production_id = 94),
+  [3219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 5, .production_id = 94),
   [3221] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_regex, 2, .production_id = 10),
   [3223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_regex, 2, .production_id = 10),
   [3225] = {.entry = {.count = 1, .reusable = false}}, SHIFT(808),
   [3227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(914),
   [3229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do, 3),
   [3231] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do, 3),
-  [3233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unless, 5, .production_id = 80),
-  [3235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 5, .production_id = 80),
+  [3233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unless, 5, .production_id = 79),
+  [3235] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 5, .production_id = 79),
   [3237] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_array, 4, .production_id = 48),
   [3239] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_array, 4, .production_id = 48),
-  [3241] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_method, 6, .production_id = 95),
-  [3243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_method, 6, .production_id = 95),
+  [3241] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_method, 6, .production_id = 93),
+  [3243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_method, 6, .production_id = 93),
   [3245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_array, 4),
   [3247] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_array, 4),
   [3249] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_begin, 3),
   [3251] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_begin, 3),
   [3253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_array, 6, .production_id = 49),
   [3255] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_array, 6, .production_id = 49),
-  [3257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unless, 5, .production_id = 79),
-  [3259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 5, .production_id = 79),
-  [3261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5, .production_id = 80),
-  [3263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5, .production_id = 80),
+  [3257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unless, 5, .production_id = 78),
+  [3259] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 5, .production_id = 78),
+  [3261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5, .production_id = 79),
+  [3263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5, .production_id = 79),
   [3265] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_array, 6, .production_id = 48),
   [3267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_array, 6, .production_id = 48),
-  [3269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5, .production_id = 79),
-  [3271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5, .production_id = 79),
+  [3269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5, .production_id = 78),
+  [3271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5, .production_id = 78),
   [3273] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_yield, 2),
   [3275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_yield, 2),
   [3277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_break, 2),
@@ -448765,10 +448752,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_redo, 2),
   [3301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_retry, 2),
   [3303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_retry, 2),
-  [3305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 78),
-  [3307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 78),
-  [3309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 5, .production_id = 78),
-  [3311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 5, .production_id = 78),
+  [3305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 5, .production_id = 77),
+  [3307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module, 5, .production_id = 77),
+  [3309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 5, .production_id = 77),
+  [3311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 5, .production_id = 77),
   [3313] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case, 4, .production_id = 32),
   [3315] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case, 4, .production_id = 32),
   [3317] = {.entry = {.count = 1, .reusable = false}}, SHIFT(433),
@@ -448787,8 +448774,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3343] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 4, .production_id = 54),
   [3345] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_subshell, 3, .production_id = 24),
   [3347] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_subshell, 3, .production_id = 24),
-  [3349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 5, .production_id = 77),
-  [3351] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 5, .production_id = 77),
+  [3349] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class, 5, .production_id = 76),
+  [3351] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class, 5, .production_id = 76),
   [3353] = {.entry = {.count = 1, .reusable = false}}, SHIFT(411),
   [3355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
   [3357] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 4, .production_id = 64),
@@ -448799,16 +448786,16 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3367] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unless, 4, .production_id = 55),
   [3369] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_literal, 2, .production_id = 11),
   [3371] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_literal, 2, .production_id = 11),
-  [3373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 4, .production_id = 75),
-  [3375] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 4, .production_id = 75),
+  [3373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 4, .production_id = 74),
+  [3375] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 4, .production_id = 74),
   [3377] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 46),
   [3379] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_assignment, 3, .production_id = 46),
   [3381] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 4, .production_id = 53),
   [3383] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 4, .production_id = 53),
   [3385] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_operator_assignment, 3, .production_id = 39),
   [3387] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_operator_assignment, 3, .production_id = 39),
-  [3389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 4, .production_id = 74),
-  [3391] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 4, .production_id = 74),
+  [3389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_rest, 4, .production_id = 73),
+  [3391] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_rest, 4, .production_id = 73),
   [3393] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 3, .production_id = 47),
   [3395] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 3, .production_id = 47),
   [3397] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_hash, 5),
@@ -448843,12 +448830,12 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3455] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do, 2),
   [3457] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 2),
   [3459] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_argument_list, 2),
-  [3461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 4, .production_id = 90),
-  [3463] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 4, .production_id = 90),
+  [3461] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 4, .production_id = 89),
+  [3463] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 4, .production_id = 89),
   [3465] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 3, .production_id = 36),
   [3467] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 3, .production_id = 36),
-  [3469] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 4, .production_id = 73),
-  [3471] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 4, .production_id = 73),
+  [3469] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 4, .production_id = 72),
+  [3471] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 4, .production_id = 72),
   [3473] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array, 2),
   [3475] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_array, 2),
   [3477] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_complex, 2),
@@ -448881,29 +448868,29 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3531] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_array, 3),
   [3533] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rational, 2),
   [3535] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rational, 2),
-  [3537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 6, .production_id = 113),
-  [3539] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 6, .production_id = 113),
+  [3537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 6, .production_id = 111),
+  [3539] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 6, .production_id = 111),
   [3541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_hash, 4),
   [3543] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_hash, 4),
   [3545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 3),
   [3547] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 3),
   [3549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_statements, 2),
   [3551] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_parenthesized_statements, 2),
-  [3553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 6, .production_id = 105),
-  [3555] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 6, .production_id = 105),
-  [3557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 93),
-  [3559] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 93),
+  [3553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 6, .production_id = 103),
+  [3555] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 6, .production_id = 103),
+  [3557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 91),
+  [3559] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 91),
   [3561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 3, .production_id = 45),
   [3563] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 3, .production_id = 45),
-  [3565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 92),
-  [3567] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 92),
+  [3565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 90),
+  [3567] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 90),
   [3569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 70),
   [3571] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 70),
   [3573] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1265),
   [3575] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_lambda, 2, .production_id = 16),
   [3577] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_lambda, 2, .production_id = 16),
-  [3579] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 91),
-  [3581] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 91),
+  [3579] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_do_block, 4, .production_id = 89),
+  [3581] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 4, .production_id = 89),
   [3583] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method, 2, .production_id = 13),
   [3585] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_method, 2, .production_id = 13),
   [3587] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_unary, 2, .production_id = 11),
@@ -448916,10 +448903,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3601] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_do_block, 3, .production_id = 70),
   [3603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case, 5, .production_id = 32),
   [3605] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case, 5, .production_id = 32),
-  [3607] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 5, .production_id = 86),
-  [3609] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 5, .production_id = 86),
-  [3611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 5, .production_id = 87),
-  [3613] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 5, .production_id = 87),
+  [3607] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 5, .production_id = 85),
+  [3609] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 5, .production_id = 85),
+  [3611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case_match, 5, .production_id = 86),
+  [3613] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case_match, 5, .production_id = 86),
   [3615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_case, 5),
   [3617] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_case, 5),
   [3619] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 3, .production_id = 16),
@@ -449021,8 +449008,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3812] = {.entry = {.count = 1, .reusable = true}}, SHIFT(493),
   [3814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1651),
   [3816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1285),
-  [3818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional, 5, .production_id = 94),
-  [3820] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional, 5, .production_id = 94),
+  [3818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional, 5, .production_id = 92),
+  [3820] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional, 5, .production_id = 92),
   [3822] = {.entry = {.count = 1, .reusable = false}}, SHIFT(3052),
   [3824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3042),
   [3826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3052),
@@ -450012,8 +449999,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1426),
   [5824] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1451),
   [5826] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1451),
-  [5828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_parameter, 3, .production_id = 72),
-  [5830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_parameter, 3, .production_id = 72),
+  [5828] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_parameter, 3, .production_id = 71),
+  [5830] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keyword_parameter, 3, .production_id = 71),
   [5832] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1016),
   [5834] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1011),
   [5836] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1008),
@@ -450099,8 +450086,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5997] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1907),
   [5999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1907),
   [6001] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1915),
-  [6003] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_keyword_parameter, 3, .production_id = 72),
-  [6005] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_optional_parameter, 3, .production_id = 72),
+  [6003] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_keyword_parameter, 3, .production_id = 71),
+  [6005] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_optional_parameter, 3, .production_id = 71),
   [6007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5392),
   [6009] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1181),
   [6011] = {.entry = {.count = 1, .reusable = false}}, SHIFT(1784),
@@ -450366,8 +450353,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6539] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2083),
   [6541] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
   [6543] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
-  [6545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 103),
-  [6547] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 103), SHIFT_REPEAT(2166),
+  [6545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 101),
+  [6547] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 101), SHIFT_REPEAT(2166),
   [6550] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_argument_list_repeat1, 2), SHIFT_REPEAT(403),
   [6553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2297),
   [6555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5596),
@@ -450376,7 +450363,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2937),
   [6563] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_argument_list_repeat1, 2), SHIFT_REPEAT(406),
   [6566] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1459),
-  [6568] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alternative_pattern, 2, .production_id = 85),
+  [6568] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alternative_pattern, 2, .production_id = 84),
   [6570] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2166),
   [6572] = {.entry = {.count = 1, .reusable = false}}, SHIFT(2128),
   [6574] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__pattern_expr_alt, 1),
@@ -450443,10 +450430,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6699] = {.entry = {.count = 1, .reusable = false}}, SHIFT(4997),
   [6701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5139),
   [6703] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_argument_list_repeat1, 2), SHIFT_REPEAT(400),
-  [6706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_hash_pattern, 4, .production_id = 104),
-  [6708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_find_pattern, 4, .production_id = 104),
+  [6706] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_hash_pattern, 4, .production_id = 102),
+  [6708] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_find_pattern, 4, .production_id = 102),
   [6710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
-  [6712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_reference_pattern, 4, .production_id = 76),
+  [6712] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression_reference_pattern, 4, .production_id = 75),
   [6714] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_argument_list_repeat1, 2), SHIFT_REPEAT(407),
   [6717] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__pattern_value, 1, .production_id = 62),
   [6719] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2942),
@@ -450468,13 +450455,13 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6751] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parenthesized_pattern, 3),
   [6753] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_pattern, 3),
   [6755] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_find_pattern, 3),
-  [6757] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_pattern, 4, .production_id = 104),
-  [6759] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_pattern, 3, .production_id = 104),
+  [6757] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_pattern, 4, .production_id = 102),
+  [6759] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_pattern, 3, .production_id = 102),
   [6761] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__pattern_range, 3, .production_id = 40),
-  [6763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 102),
+  [6763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 100),
   [6765] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__hash_pattern_body_repeat1, 2), SHIFT_REPEAT(4438),
   [6768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__hash_pattern_body_repeat1, 2),
-  [6770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_as_pattern, 3, .production_id = 101),
+  [6770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_as_pattern, 3, .production_id = 99),
   [6772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2073),
   [6774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__array_pattern_n, 3),
   [6776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5517),
@@ -450548,7 +450535,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6916] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block_parameter, 1),
   [6918] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block_parameter, 1),
   [6920] = {.entry = {.count = 1, .reusable = false}}, SHIFT(4907),
-  [6922] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 103), SHIFT_REPEAT(2167),
+  [6922] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_alternative_pattern_repeat1, 2, .production_id = 101), SHIFT_REPEAT(2167),
   [6925] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2167),
   [6927] = {.entry = {.count = 1, .reusable = false}}, SHIFT(5657),
   [6929] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2355),
@@ -450714,8 +450701,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2929),
   [7261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unless_guard, 2, .production_id = 55),
   [7263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elsif, 3, .production_id = 54),
-  [7265] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_when_repeat1, 2, .production_id = 83), SHIFT_REPEAT(821),
-  [7268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_when_repeat1, 2, .production_id = 83),
+  [7265] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_when_repeat1, 2, .production_id = 82), SHIFT_REPEAT(821),
+  [7268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_when_repeat1, 2, .production_id = 82),
   [7270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_case_match_repeat1, 2, .production_id = 65),
   [7272] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_case_match_repeat1, 2, .production_id = 65), SHIFT_REPEAT(2061),
   [7275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1452),
@@ -450772,7 +450759,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__argument_list_with_trailing_comma, 1),
   [7385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
   [7387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_when_repeat1, 2, .production_id = 58),
-  [7389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rescue, 4, .production_id = 88),
+  [7389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rescue, 4, .production_id = 87),
   [7391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4358),
   [7393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3075),
   [7395] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3071),
@@ -450795,8 +450782,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7431] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2842),
   [7433] = {.entry = {.count = 1, .reusable = true}}, SHIFT(765),
   [7435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2157),
-  [7437] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 112), SHIFT_REPEAT(5489),
-  [7440] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 112),
+  [7437] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 110), SHIFT_REPEAT(5489),
+  [7440] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 110),
   [7442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5025),
   [7444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2156),
   [7446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2152),
@@ -450808,7 +450795,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2331),
   [7460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(771),
   [7462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5009),
-  [7464] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_in_clause, 4, .production_id = 99),
+  [7464] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_in_clause, 4, .production_id = 97),
   [7466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4703),
   [7468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(528),
   [7470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(763),
@@ -450824,7 +450811,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4974),
   [7492] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_when, 3, .production_id = 57),
   [7494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5013),
-  [7496] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_when, 4, .production_id = 81),
+  [7496] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_when, 4, .production_id = 80),
   [7498] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_case_repeat1, 1),
   [7500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4904),
   [7502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5016),
@@ -450922,7 +450909,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2615),
   [7691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5088),
   [7693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2614),
-  [7695] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 110),
+  [7695] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_parameters_repeat1, 2, .production_id = 108),
   [7697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2611),
   [7699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2956),
   [7701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4740),
@@ -450989,8 +450976,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4491),
   [7825] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4487),
   [7827] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2866),
-  [7829] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elsif, 4, .production_id = 80),
-  [7831] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elsif, 4, .production_id = 79),
+  [7829] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elsif, 4, .production_id = 79),
+  [7831] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_elsif, 4, .production_id = 78),
   [7833] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2357),
   [7835] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5278),
   [7837] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5415),
diff --git a/test/corpus/expressions.txt b/test/corpus/expressions.txt
index fa5ea6c7..41a5bba0 100644
--- a/test/corpus/expressions.txt
+++ b/test/corpus/expressions.txt
@@ -908,7 +908,7 @@ end
     receiver: (identifier)
     arguments: (argument_list (pair key: (hash_key_symbol) value: (identifier)))
     block: (do_block
-      do_block_body: (body_statement (identifier)))))
+      body: (body_statement (identifier)))))
 
 ===============================
 call with operator method name
@@ -1211,7 +1211,7 @@ end
         (splat_argument (identifier)))
       block: (do_block
         parameters: (block_parameters (identifier))
-        do_block_body: (body_statement (identifier))))
+        body: (body_statement (identifier))))
     method: (identifier)
     arguments: (argument_list
       (call
@@ -1222,7 +1222,7 @@ end
             body: (block_body (identifier))))
         method: (identifier)
         block: (do_block
-          do_block_body: (body_statement (identifier)))))))
+          body: (body_statement (identifier)))))))
 
 ===============================
 method calls in binary expression
@@ -1357,7 +1357,7 @@ end
     method: (identifier)
     block: (do_block
       parameters: (block_parameters (identifier))
-    do_block_body: (body_statement
+    body: (body_statement
       (identifier)
         (rescue
           exceptions: (exceptions (constant))
@@ -1368,21 +1368,21 @@ end
     method: (identifier)
     block: (do_block
       parameters: (block_parameters (identifier))
-      do_block_body: (body_statement (identifier))))
+      body: (body_statement (identifier))))
   (call method: (identifier) block: (do_block))
   (call
     method: (identifier)
     arguments: (argument_list (identifier))
     block: (do_block
       parameters: (block_parameters (identifier))
-      do_block_body: (body_statement (identifier))))
+      body: (body_statement (identifier))))
   (call
     receiver: (identifier)
     method: (identifier)
     arguments: (argument_list (identifier))
     block: (do_block
       parameters: (block_parameters (identifier))
-      do_block_body: (body_statement (identifier))))
+      body: (body_statement (identifier))))
   (call
     method: (identifier)
     arguments: (argument_list (identifier))