diff --git a/.arclint b/.arclint
index 992fb7a..e7f15a0 100644
--- a/.arclint
+++ b/.arclint
@@ -1,48 +1,50 @@
 {
   "exclude": [
     "(^externals/)",
-    "(\\.lint-test$)"
+    "(^src/console/__tests__/wrap/.*\\.txt(\\.expect)?$)",
+    "(^src/markup/engine/__tests__/remarkup/.*\\.txt$)",
+    "(^src/markup/syntax/highlighter/__tests__/xhpast/.*\\.(expect|source)$)"
   ],
   "linters": {
     "chmod": {
       "type": "chmod"
     },
     "filename": {
       "type": "filename"
     },
     "generated": {
       "type": "generated"
     },
     "merge-conflict": {
       "type": "merge-conflict"
     },
     "nolint": {
       "type": "nolint"
     },
     "phutil-xhpast": {
       "type": "phutil-xhpast",
       "include": "(\\.php$)"
     },
     "phutil-library": {
       "type": "phutil-library",
       "include": "(\\.php$)"
     },
     "text": {
       "type": "text"
     },
     "spelling": {
       "type": "spelling"
     },
     "xhpast": {
       "type": "xhpast",
       "include": "(\\.php$)",
       "severity": {
         "16": "advice",
         "29": "warning",
         "31": "error",
         "34": "error",
         "35": "error"
       }
     }
   }
 }
diff --git a/src/parser/xhpast/__tests__/data/php-array-dereference.expect b/src/parser/xhpast/__tests__/data/php-array-dereference.expect
index ba722da..ea863ff 100644
--- a/src/parser/xhpast/__tests__/data/php-array-dereference.expect
+++ b/src/parser/xhpast/__tests__/data/php-array-dereference.expect
@@ -1,640 +1,640 @@
 {
   "tree"   : [
     9000,
     0,
     71,
     [
       [
         9006,
         0,
         70,
         [
           [
             9007,
             0,
             0
           ],
           [
             9004,
             2,
             21,
             [
               [
                 9050,
                 2,
                 21,
                 [
                   [
                     9005
                   ],
                   [
                     9005
                   ],
                   [
                     9013,
                     4,
                     4
                   ],
                   [
                     9059,
                     5,
                     6
                   ],
                   [
                     9005
                   ],
                   [
                     9006,
                     8,
                     21,
                     [
                       [
                         9004,
                         10,
                         19,
                         [
                           [
                             9027,
                             10,
                             18,
                             [
                               [
                                 9082,
                                 12,
                                 18,
                                 [
                                   [
                                     9093,
                                     13,
                                     17,
                                     [
                                       [
                                         9094,
                                         13,
                                         13,
                                         [
                                           [
                                             9005
                                           ],
                                           [
                                             9086,
                                             13,
                                             13
                                           ]
                                         ]
                                       ],
                                       [
                                         9094,
                                         15,
                                         15,
                                         [
                                           [
                                             9005
                                           ],
                                           [
                                             9086,
                                             15,
                                             15
                                           ]
                                         ]
                                       ],
                                       [
                                         9094,
                                         17,
                                         17,
                                         [
                                           [
                                             9005
                                           ],
                                           [
                                             9086,
                                             17,
                                             17
                                           ]
                                         ]
                                       ]
                                     ]
                                   ]
                                 ]
                               ]
                             ]
                           ]
                         ]
                       ]
                     ]
                   ]
                 ]
               ]
             ]
           ],
           [
             9004,
             23,
             28,
             [
               [
                 9077,
                 23,
                 27,
                 [
                   [
                     9047,
                     23,
                     23
                   ],
                   [
                     9081,
                     25,
                     25
                   ],
                   [
                     9086,
                     27,
                     27
                   ]
                 ]
               ]
             ]
           ],
           [
             9004,
             30,
             40,
             [
               [
                 9077,
                 30,
                 39,
                 [
                   [
                     9047,
                     30,
                     30
                   ],
                   [
                     9081,
                     32,
                     32
                   ],
                   [
                     9100,
                     34,
                     39,
                     [
                       [
                         9099,
                         34,
                         36,
                         [
                           [
                             9001,
                             34,
                             34
                           ],
                           [
                             9095,
                             35,
                             36
                           ]
                         ]
                       ],
                       [
                         9086,
                         38,
                         38
                       ]
                     ]
                   ]
                 ]
               ]
             ]
           ],
           [
             9004,
             42,
             52,
             [
               [
                 9077,
                 42,
                 51,
                 [
                   [
                     9047,
                     42,
                     42
                   ],
                   [
                     9081,
                     44,
                     44
                   ],
                   [
                     9100,
                     46,
                     51,
                     [
                       [
                         9099,
                         46,
                         48,
                         [
                           [
                             9001,
                             46,
                             46
                           ],
                           [
                             9095,
                             47,
                             48
                           ]
                         ]
                       ],
                       [
                         9047,
                         50,
                         50
                       ]
                     ]
                   ]
                 ]
               ]
             ]
           ],
           [
             9004,
             54,
             70,
             [
               [
                 9015,
                 54,
                 70,
                 [
                   [
                     9017,
                     54,
                     70,
                     [
                       [
                         9016,
                         56,
                         66,
                         [
                           [
                             9099,
                             57,
                             65,
                             [
                               [
                                 9001,
                                 57,
                                 57
                               ],
                               [
                                 9095,
                                 58,
                                 65,
                                 [
                                   [
                                     9100,
                                     59,
                                     64,
                                     [
                                       [
                                         9099,
                                         59,
                                         61,
                                         [
                                           [
                                             9001,
                                             59,
                                             59
                                           ],
                                           [
                                             9095,
                                             60,
                                             61
                                           ]
                                         ]
                                       ],
                                       [
                                         9086,
                                         63,
                                         63
                                       ]
                                     ]
                                   ]
                                 ]
                               ]
                             ]
                           ]
                         ]
                       ],
                       [
                         9006,
                         68,
                         70
                       ]
                     ]
                   ]
                 ]
               ]
             ]
           ]
         ]
       ]
     ]
   ],
   "stream" : [
     [
       371,
       6
     ],
     [
       375,
       1
     ],
     [
       337,
       8
     ],
     [
       375,
       1
     ],
     [
       309,
       3
     ],
     [
       40,
       1
     ],
     [
       41,
       1
     ],
     [
       375,
       1
     ],
     [
       123,
       1
     ],
     [
       375,
       3
     ],
     [
       339,
       6
     ],
     [
       375,
       1
     ],
     [
       91,
       1
     ],
     [
       307,
       1
     ],
     [
       44,
       1
     ],
     [
       307,
       1
     ],
     [
       44,
       1
     ],
     [
       307,
       1
     ],
     [
       93,
       1
     ],
     [
       59,
       1
     ],
     [
       375,
       1
     ],
     [
       125,
       1
     ],
     [
       375,
       2
     ],
     [
       311,
       2
     ],
     [
       375,
       1
     ],
     [
       61,
       1
     ],
     [
       375,
       1
     ],
     [
       307,
       1
     ],
     [
       59,
       1
     ],
     [
       375,
       1
     ],
     [
       311,
       2
     ],
     [
       375,
       1
     ],
     [
       61,
       1
     ],
     [
       375,
       1
     ],
     [
       309,
       3
     ],
     [
       40,
       1
     ],
     [
       41,
       1
     ],
     [
       91,
       1
     ],
     [
       307,
       1
     ],
     [
       93,
       1
     ],
     [
       59,
       1
     ],
     [
       375,
       2
     ],
     [
       311,
       2
     ],
     [
       375,
       1
     ],
     [
       61,
       1
     ],
     [
       375,
       1
     ],
     [
       309,
       3
     ],
     [
       40,
       1
     ],
     [
       41,
       1
     ],
     [
       91,
       1
     ],
     [
       311,
       2
     ],
     [
       93,
       1
     ],
     [
       59,
       1
     ],
     [
       375,
       2
     ],
     [
       303,
       2
     ],
     [
       375,
       1
     ],
     [
       40,
       1
     ],
     [
       353,
       5
     ],
     [
       40,
       1
     ],
     [
       309,
       3
     ],
     [
       40,
       1
     ],
     [
       41,
       1
     ],
     [
       91,
       1
     ],
     [
       307,
       1
     ],
     [
       93,
       1
     ],
     [
       41,
       1
     ],
     [
       41,
       1
     ],
     [
       375,
       1
     ],
     [
       123,
       1
     ],
     [
       375,
       1
     ],
     [
       125,
       1
     ],
     [
       375,
-      2
+      1
     ]
   ]
 }
diff --git a/src/parser/xhpast/__tests__/data/php-array-dereference.test b/src/parser/xhpast/__tests__/data/php-array-dereference.test
index 91c5a1a..24a1590 100644
--- a/src/parser/xhpast/__tests__/data/php-array-dereference.test
+++ b/src/parser/xhpast/__tests__/data/php-array-dereference.test
@@ -1,14 +1,13 @@
 # pass
 <?php
 
 function foo() {
   return [1,2,3];
 }
 
 $i = 1;
 $x = foo()[2];
 
 $y = foo()[$i];
 
 if (isset(foo()[0])) { }
-