diff --git a/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
index 277e15e0..8c37ab43 100644
--- a/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistAbstractMethodBodyXHPASTLinterRule.php
@@ -14,7 +14,7 @@ final class ArcanistAbstractMethodBodyXHPASTLinterRule
 
     foreach ($methods as $method) {
       $modifiers = $this->getModifiers($method);
-      $body = $method->getChildByIndex(5);
+      $body = $method->getChildByIndex(6);
 
       if (idx($modifiers, 'abstract') && $body->getTypeName() != 'n_EMPTY') {
         $this->raiseLintAtNode(
diff --git a/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
index f4835d0b..bf230be0 100644
--- a/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistInterfaceMethodBodyXHPASTLinterRule.php
@@ -16,7 +16,7 @@ final class ArcanistInterfaceMethodBodyXHPASTLinterRule
       $methods = $interface->selectDescendantsOfType('n_METHOD_DECLARATION');
 
       foreach ($methods as $method) {
-        $body = $method->getChildByIndex(5);
+        $body = $method->getChildByIndex(6);
 
         if ($body->getTypeName() != 'n_EMPTY') {
           $this->raiseLintAtNode(
diff --git a/src/lint/linter/xhpast/rules/ArcanistReusedAsIteratorXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistReusedAsIteratorXHPASTLinterRule.php
index 182edc69..a1a4cc52 100644
--- a/src/lint/linter/xhpast/rules/ArcanistReusedAsIteratorXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistReusedAsIteratorXHPASTLinterRule.php
@@ -46,7 +46,7 @@ final class ArcanistReusedAsIteratorXHPASTLinterRule
         $vars[] = $var;
       }
 
-      $body = $def->getChildByIndex(5);
+      $body = $def->getChildByIndex(6);
       if ($body->getTypeName() === 'n_EMPTY') {
         // Abstract method declaration.
         continue;
diff --git a/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
index 65851435..fc6b8a6b 100644
--- a/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php
@@ -31,7 +31,7 @@ final class ArcanistReusedIteratorReferenceXHPASTLinterRule
     ));
 
     foreach ($defs as $def) {
-      $body = $def->getChildByIndex(5);
+      $body = $def->getChildByIndex(6);
       if ($body->getTypeName() === 'n_EMPTY') {
         // Abstract method declaration.
         continue;
diff --git a/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
index 695d0858..e18c5135 100644
--- a/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php
@@ -40,7 +40,7 @@ final class ArcanistStaticThisXHPASTLinterRule
           continue;
         }
 
-        $body = $method->getChildOfType(5, 'n_STATEMENT_LIST');
+        $body = $method->getChildOfType(6, 'n_STATEMENT_LIST');
         $variables = $body->selectDescendantsOfType('n_VARIABLE');
 
         foreach ($variables as $variable) {
diff --git a/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
index ab0eba56..315331ee 100644
--- a/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php
@@ -21,7 +21,7 @@ final class ArcanistToStringExceptionXHPASTLinterRule
         continue;
       }
 
-      $statements = $method->getChildByIndex(5);
+      $statements = $method->getChildByIndex(6);
 
       if ($statements->getTypeName() != 'n_STATEMENT_LIST') {
         continue;
diff --git a/src/lint/linter/xhpast/rules/ArcanistUndeclaredVariableXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUndeclaredVariableXHPASTLinterRule.php
index 2a389e34..b1f997e9 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUndeclaredVariableXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUndeclaredVariableXHPASTLinterRule.php
@@ -88,7 +88,7 @@ final class ArcanistUndeclaredVariableXHPASTLinterRule
         $vars[] = $var;
       }
 
-      $body = $def->getChildByIndex(5);
+      $body = $def->getChildByIndex(6);
       if ($body->getTypeName() === 'n_EMPTY') {
         // Abstract method declaration.
         continue;
diff --git a/src/lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php
index 475ed25f..add72ca8 100644
--- a/src/lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php
@@ -40,7 +40,7 @@ final class ArcanistUselessOverridingMethodXHPASTLinterRule
         $parameters[] = $parameter->getConcreteString();
       }
 
-      $statements = $method->getChildByIndex(5);
+      $statements = $method->getChildByIndex(6);
 
       if ($statements->getTypeName() != 'n_STATEMENT_LIST') {
         continue;