diff --git a/composer.lock b/composer.lock
index 8a3cf60..f3aa60a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -382,16 +382,16 @@
         },
         {
             "name": "hhvm/hhast",
-            "version": "v3.27.3",
+            "version": "v3.27.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hhvm/hhast.git",
-                "reference": "986f489c1bd3caddb27797c45abb6227c3d39366"
+                "reference": "6427a690f8436bf697972dd88e91705cbdce7fbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hhvm/hhast/zipball/986f489c1bd3caddb27797c45abb6227c3d39366",
-                "reference": "986f489c1bd3caddb27797c45abb6227c3d39366",
+                "url": "https://api.github.com/repos/hhvm/hhast/zipball/6427a690f8436bf697972dd88e91705cbdce7fbd",
+                "reference": "6427a690f8436bf697972dd88e91705cbdce7fbd",
                 "shasum": ""
             },
             "require": {
@@ -416,7 +416,7 @@
             "license": [
                 "MIT"
             ],
-            "time": "2018-08-02T21:19:25+00:00"
+            "time": "2018-08-06T23:04:30+00:00"
         },
         {
             "name": "hhvm/type-assert",
diff --git a/examples/BaseRouterExample.php b/examples/BaseRouterExample.php
index 5b6da99..e6c1d44 100644
--- a/examples/BaseRouterExample.php
+++ b/examples/BaseRouterExample.php
@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -16,8 +16,8 @@
 
 require_once(__DIR__.'/../vendor/hh_autoload.php');
 
-use Facebook\HackRouter\BaseRouter;
-use Facebook\HackRouter\HttpMethod;
+use type Facebook\HackRouter\BaseRouter;
+use type Facebook\HackRouter\HttpMethod;
 
 /** This can be whatever you want; in this case, it's a
  * callable, but classname<MyWebControllerBase> is also a
@@ -67,4 +67,5 @@ function main(): void {
   }
 }
 
+/* HH_IGNORE_ERROR[1002] top-level statement in strict file */
 main();
diff --git a/examples/UriPatternsExample.php b/examples/UriPatternsExample.php
index b1afd95..0363da9 100644
--- a/examples/UriPatternsExample.php
+++ b/examples/UriPatternsExample.php
@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -16,14 +16,13 @@
 
 require_once(__DIR__.'/../vendor/hh_autoload.php');
 
-use Facebook\HackRouter\{
+use   type Facebook\HackRouter\{
   BaseRouter,
   GetFastRoutePatternFromUriPattern,
   GetUriBuilderFromUriPattern,
   HasUriPattern,
   HttpMethod,
   RequestParameters,
-  UriBuilder,
   UriPattern
 };
 
@@ -124,4 +123,5 @@ function main(): void {
   }
 }
 
+/* HH_IGNORE_ERROR[1002] top-level statement in strict file */
 main();
diff --git a/src/PatternParser/LiteralNode.php b/src/PatternParser/LiteralNode.php
index f0ef3eb..8fb1069 100644
--- a/src/PatternParser/LiteralNode.php
+++ b/src/PatternParser/LiteralNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/Node.php b/src/PatternParser/Node.php
index 3587450..ed2581e 100644
--- a/src/PatternParser/Node.php
+++ b/src/PatternParser/Node.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/OptionalNode.php b/src/PatternParser/OptionalNode.php
index b5c9826..4aff14a 100644
--- a/src/PatternParser/OptionalNode.php
+++ b/src/PatternParser/OptionalNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/ParameterNode.php b/src/PatternParser/ParameterNode.php
index 793bd76..ff64c3d 100644
--- a/src/PatternParser/ParameterNode.php
+++ b/src/PatternParser/ParameterNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,6 @@
 
 namespace Facebook\HackRouter\PatternParser;
 
-use namespace HH\Lib\Str;
 
 final class ParameterNode implements Node {
   public function __construct(private string $name, private ?string $regexp) {
diff --git a/src/PatternParser/Parser.php b/src/PatternParser/Parser.php
index d614473..d1bd89a 100644
--- a/src/PatternParser/Parser.php
+++ b/src/PatternParser/Parser.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/PatternNode.php b/src/PatternParser/PatternNode.php
index 0c2199e..f46267f 100644
--- a/src/PatternParser/PatternNode.php
+++ b/src/PatternParser/PatternNode.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,7 @@
 
 namespace Facebook\HackRouter\PatternParser;
 
-use namespace HH\Lib\{Keyset, Str, Vec};
+use namespace HH\Lib\{Str, Vec};
 
 final class PatternNode implements Node {
   public function __construct(private vec<Node> $children) {
diff --git a/src/PatternParser/Token.php b/src/PatternParser/Token.php
index fdfe0d7..9b3f96f 100644
--- a/src/PatternParser/Token.php
+++ b/src/PatternParser/Token.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/TokenType.php b/src/PatternParser/TokenType.php
index 62d5207..ab17264 100644
--- a/src/PatternParser/TokenType.php
+++ b/src/PatternParser/TokenType.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/PatternParser/tokenize.php b/src/PatternParser/tokenize.php
index d952af1..41db7ac 100644
--- a/src/PatternParser/tokenize.php
+++ b/src/PatternParser/tokenize.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/EnumRequestParameter.php b/src/request-parameters/EnumRequestParameter.php
index 82e8e36..b76ecf7 100644
--- a/src/request-parameters/EnumRequestParameter.php
+++ b/src/request-parameters/EnumRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/IntRequestParameter.php b/src/request-parameters/IntRequestParameter.php
index af2aa69..2db715d 100644
--- a/src/request-parameters/IntRequestParameter.php
+++ b/src/request-parameters/IntRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/RequestParameter.php b/src/request-parameters/RequestParameter.php
index c58798a..527c868 100644
--- a/src/request-parameters/RequestParameter.php
+++ b/src/request-parameters/RequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/StringRequestParameter.php b/src/request-parameters/StringRequestParameter.php
index e994632..c4e443c 100644
--- a/src/request-parameters/StringRequestParameter.php
+++ b/src/request-parameters/StringRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/TypedRequestParameter.php b/src/request-parameters/TypedRequestParameter.php
index a99d11e..de76f39 100644
--- a/src/request-parameters/TypedRequestParameter.php
+++ b/src/request-parameters/TypedRequestParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/TypedUriParameter.php b/src/request-parameters/TypedUriParameter.php
index 5e99658..7852db0 100644
--- a/src/request-parameters/TypedUriParameter.php
+++ b/src/request-parameters/TypedUriParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/request-parameters/UriParameter.php b/src/request-parameters/UriParameter.php
index f5f61dd..d42cbd0 100644
--- a/src/request-parameters/UriParameter.php
+++ b/src/request-parameters/UriParameter.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/router/HttpMethod.php b/src/router/HttpMethod.php
index 71ebc46..fc7d1dd 100644
--- a/src/router/HttpMethod.php
+++ b/src/router/HttpMethod.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/router/PrefixMatching/PrefixMap.php b/src/router/PrefixMatching/PrefixMap.php
index a4bb23d..9da45ab 100644
--- a/src/router/PrefixMatching/PrefixMap.php
+++ b/src/router/PrefixMatching/PrefixMap.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/router/PrefixMatching/PrefixMapOrResponder.php b/src/router/PrefixMatching/PrefixMapOrResponder.php
index a82783b..3582010 100644
--- a/src/router/PrefixMatching/PrefixMapOrResponder.php
+++ b/src/router/PrefixMatching/PrefixMapOrResponder.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
@@ -10,7 +10,6 @@
 
 namespace Facebook\HackRouter\PrefixMatching;
 
-use namespace Facebook\TypeAssert;
 
 final class PrefixMapOrResponder<T> {
   public function __construct(
diff --git a/src/uri-patterns/GetFastRoutePatternFromUriPattern.php b/src/uri-patterns/GetFastRoutePatternFromUriPattern.php
index bc72792..c5e9321 100644
--- a/src/uri-patterns/GetFastRoutePatternFromUriPattern.php
+++ b/src/uri-patterns/GetFastRoutePatternFromUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/GetUriBuilderFromUriPattern.php b/src/uri-patterns/GetUriBuilderFromUriPattern.php
index 6a076ca..18e9841 100644
--- a/src/uri-patterns/GetUriBuilderFromUriPattern.php
+++ b/src/uri-patterns/GetUriBuilderFromUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/HasFastRouteFragment.php b/src/uri-patterns/HasFastRouteFragment.php
index 9003445..c3e4fd4 100644
--- a/src/uri-patterns/HasFastRouteFragment.php
+++ b/src/uri-patterns/HasFastRouteFragment.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/HasUriPattern.php b/src/uri-patterns/HasUriPattern.php
index d536bb7..b1d4596 100644
--- a/src/uri-patterns/HasUriPattern.php
+++ b/src/uri-patterns/HasUriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriBuilder.php b/src/uri-patterns/UriBuilder.php
index 28f44f9..44a7ba6 100644
--- a/src/uri-patterns/UriBuilder.php
+++ b/src/uri-patterns/UriBuilder.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriBuilderBase.php b/src/uri-patterns/UriBuilderBase.php
index 3b31f30..5ee8c6a 100644
--- a/src/uri-patterns/UriBuilderBase.php
+++ b/src/uri-patterns/UriBuilderBase.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriBuilderGetPath.php b/src/uri-patterns/UriBuilderGetPath.php
index 1ff78b8..dc84496 100644
--- a/src/uri-patterns/UriBuilderGetPath.php
+++ b/src/uri-patterns/UriBuilderGetPath.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriBuilderSetters.php b/src/uri-patterns/UriBuilderSetters.php
index 12db0e9..746a66b 100644
--- a/src/uri-patterns/UriBuilderSetters.php
+++ b/src/uri-patterns/UriBuilderSetters.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriBuilderWithPath.php b/src/uri-patterns/UriBuilderWithPath.php
index 3b41f35..ac0ccdc 100644
--- a/src/uri-patterns/UriBuilderWithPath.php
+++ b/src/uri-patterns/UriBuilderWithPath.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriPattern.php b/src/uri-patterns/UriPattern.php
index 8f267ff..d0c7da6 100644
--- a/src/uri-patterns/UriPattern.php
+++ b/src/uri-patterns/UriPattern.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriPatternLiteral.php b/src/uri-patterns/UriPatternLiteral.php
index 8d39e72..5eca55b 100644
--- a/src/uri-patterns/UriPatternLiteral.php
+++ b/src/uri-patterns/UriPatternLiteral.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/src/uri-patterns/UriPatternPart.php b/src/uri-patterns/UriPatternPart.php
index 19dfe6b..39ad446 100644
--- a/src/uri-patterns/UriPatternPart.php
+++ b/src/uri-patterns/UriPatternPart.php
@@ -1,4 +1,4 @@
-<?hh //strict
+<?hh // strict
 /*
  *  Copyright (c) 2015-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/RequestParametersTest.php b/tests/RequestParametersTest.php
index 92c200f..4e42290 100644
--- a/tests/RequestParametersTest.php
+++ b/tests/RequestParametersTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestIntEnum;
-use \Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
 
 final class RequestParametersTest extends \PHPUnit_Framework_TestCase {
   public function testStringParam(): void {
diff --git a/tests/RouterTest.php b/tests/RouterTest.php
index dbba67d..efee0d8 100644
--- a/tests/RouterTest.php
+++ b/tests/RouterTest.php
@@ -10,10 +10,10 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestRouter;
-use \Zend\Diactoros\ServerRequest;
+use type Facebook\HackRouter\Tests\TestRouter;
+use type Zend\Diactoros\ServerRequest;
 use function Facebook\FBExpect\expect;
-use namespace HH\Lib\{C, Dict, Str};
+use namespace HH\Lib\Dict;
 
 final class RouterTest extends \PHPUnit_Framework_TestCase {
   const keyset<string> MAP = keyset[
@@ -100,7 +100,7 @@ public function expectedMatchesWithResolvers(
 
   /** @dataProvider getAllResolvers */
   public function testMethodNotAllowedResponses(
-    string $name,
+    string $_name,
     (function(dict<HttpMethod, dict<string, string>>): IResolver<string>) $factory
   ): void {
     $map = dict[
@@ -148,7 +148,7 @@ public function testMatchesPattern(
    * @dataProvider expectedMatchesWithResolvers
    */
   public function testAllResolvers(
-    string $resolver_name,
+    string $_resolver_name,
     IResolver<string> $resolver,
     string $in,
     string $expected_responder,
diff --git a/tests/UriBuilderTest.php b/tests/UriBuilderTest.php
index f7a1c59..d357686 100644
--- a/tests/UriBuilderTest.php
+++ b/tests/UriBuilderTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestIntEnum;
-use \Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
 
 final class UriBuilderTest extends \PHPUnit_Framework_TestCase {
   public function testLiteral(): void {
diff --git a/tests/UriPatternTest.php b/tests/UriPatternTest.php
index 8f7b3da..385f161 100644
--- a/tests/UriPatternTest.php
+++ b/tests/UriPatternTest.php
@@ -10,8 +10,8 @@
 
 namespace Facebook\HackRouter;
 
-use \Facebook\HackRouter\Tests\TestStringEnum;
-use \Facebook\HackRouter\Tests\TestIntEnum;
+use type Facebook\HackRouter\Tests\TestStringEnum;
+use type Facebook\HackRouter\Tests\TestIntEnum;
 
 final class UriPatternTest extends \PHPUnit_Framework_TestCase {
   public function testLiteral(): void {