diff --git a/composer.json b/composer.json
index 9694b2e..59edce8 100644
--- a/composer.json
+++ b/composer.json
@@ -7,8 +7,7 @@
     "hhvm": "^3.23.0",
     "hack-psr/psr7-http-message-hhi": "^0.2.0|^1.0.0",
     "hhvm/hsl": "^1.0.0",
-    "hhvm/hhvm-autoload": "^1.5.3",
-    "hhvm/hhast": "^1.0"
+    "hhvm/hhvm-autoload": "^1.5.3"
   },
   "extra": {
     "branch-alias": {
@@ -19,6 +18,7 @@
     "phpunit/phpunit": "^5.1",
     "91carriage/phpunit-hhi": "^5.1",
     "zendframework/zend-diactoros": "^1.3",
-    "facebook/fbexpect": "^0.4.0"
+    "facebook/fbexpect": "^0.4.0",
+    "hhvm/hhast": "^1.0"
   }
 }
diff --git a/composer.lock b/composer.lock
index 9bd7205..005fcda 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "63432440f57aeb40257fe450b3b9fcc1",
+    "content-hash": "078ebc0cf0f20eb44b6baca2e7ba7f51",
     "packages": [
         {
             "name": "fredemmott/hack-error-suppressor",
@@ -78,39 +78,6 @@
             ],
             "time": "2018-02-09T20:54:15+00:00"
         },
-        {
-            "name": "hhvm/hhast",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/hhast.git",
-                "reference": "ddd9ec394375922e609d8c88a83142fd3cc89de2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hhast/zipball/ddd9ec394375922e609d8c88a83142fd3cc89de2",
-                "reference": "ddd9ec394375922e609d8c88a83142fd3cc89de2",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.24.0",
-                "hhvm/hsl": "^1.0.0",
-                "hhvm/type-assert": "^3.1"
-            },
-            "require-dev": {
-                "91carriage/phpunit-hhi": "^5.7",
-                "facebook/fbexpect": "^0.4.0",
-                "facebook/hack-codegen": "~3.0.3",
-                "hhvm/hhvm-autoload": "^1.5",
-                "phpunit/phpunit": "^5.7"
-            },
-            "bin": [
-                "bin/hhast-lint"
-            ],
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "time": "2018-02-09T18:24:19+00:00"
-        },
         {
             "name": "hhvm/hhvm-autoload",
             "version": "v1.6.1",
@@ -189,39 +156,6 @@
             "description": "The Hack Standard Library",
             "time": "2018-02-05T22:10:31+00:00"
         },
-        {
-            "name": "hhvm/type-assert",
-            "version": "v3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hhvm/type-assert.git",
-                "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/type-assert/zipball/8f70814c8268f50e2fa728893d3ad9cad73df398",
-                "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398",
-                "shasum": ""
-            },
-            "require": {
-                "hhvm": "^3.23.0",
-                "hhvm/hhvm-autoload": "^1.4",
-                "hhvm/hsl": "^1.0"
-            },
-            "require-dev": {
-                "91carriage/phpunit-hhi": "~5.1",
-                "facebook/fbexpect": "^0.2.0 | ^0.3.0 | ^0.4.0",
-                "phpunit/phpunit": "~5.1"
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "description": "Convert untyped data to typed data",
-            "keywords": [
-                "TypeAssert",
-                "hack"
-            ],
-            "time": "2018-02-09T17:05:23+00:00"
-        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -410,6 +344,72 @@
             "description": "Unit test helpers for Facebook projects",
             "time": "2018-02-09T00:09:55+00:00"
         },
+        {
+            "name": "hhvm/hhast",
+            "version": "v1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hhvm/hhast.git",
+                "reference": "ddd9ec394375922e609d8c88a83142fd3cc89de2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hhvm/hhast/zipball/ddd9ec394375922e609d8c88a83142fd3cc89de2",
+                "reference": "ddd9ec394375922e609d8c88a83142fd3cc89de2",
+                "shasum": ""
+            },
+            "require": {
+                "hhvm": "^3.24.0",
+                "hhvm/hsl": "^1.0.0",
+                "hhvm/type-assert": "^3.1"
+            },
+            "require-dev": {
+                "91carriage/phpunit-hhi": "^5.7",
+                "facebook/fbexpect": "^0.4.0",
+                "facebook/hack-codegen": "~3.0.3",
+                "hhvm/hhvm-autoload": "^1.5",
+                "phpunit/phpunit": "^5.7"
+            },
+            "bin": [
+                "bin/hhast-lint"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "time": "2018-02-09T18:24:19+00:00"
+        },
+        {
+            "name": "hhvm/type-assert",
+            "version": "v3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hhvm/type-assert.git",
+                "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hhvm/type-assert/zipball/8f70814c8268f50e2fa728893d3ad9cad73df398",
+                "reference": "8f70814c8268f50e2fa728893d3ad9cad73df398",
+                "shasum": ""
+            },
+            "require": {
+                "hhvm": "^3.23.0",
+                "hhvm/hhvm-autoload": "^1.4",
+                "hhvm/hsl": "^1.0"
+            },
+            "require-dev": {
+                "91carriage/phpunit-hhi": "~5.1",
+                "facebook/fbexpect": "^0.2.0 | ^0.3.0 | ^0.4.0",
+                "phpunit/phpunit": "~5.1"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "description": "Convert untyped data to typed data",
+            "keywords": [
+                "TypeAssert",
+                "hack"
+            ],
+            "time": "2018-02-09T17:05:23+00:00"
+        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.7.0",