diff --git a/src/lint/linter/ArcanistXHPASTLinter.php b/src/lint/linter/ArcanistXHPASTLinter.php
index b845f55e..ce5b3062 100644
--- a/src/lint/linter/ArcanistXHPASTLinter.php
+++ b/src/lint/linter/ArcanistXHPASTLinter.php
@@ -156,7 +156,7 @@ final class ArcanistXHPASTLinter extends ArcanistLinter {
   }
 
   public function getCacheVersion() {
-    return '1-'.md5_file(xhpast_get_binary_path());
+    return '2-'.md5_file(xhpast_get_binary_path());
   }
 
   public function lintPath($path) {
@@ -298,25 +298,11 @@ final class ArcanistXHPASTLinter extends ArcanistLinter {
         continue;
       }
 
-      // TODO: Desceptively, n_STRING_SCALAR may include variables, mostly
-      // because I was lazy when implementing the parser. We should perform more
-      // strict checks here, and/or enhance the parser.
-
       $identifier = $parameters->getChildByIndex(0);
-      if ($identifier->getTypeName() == 'n_STRING_SCALAR' ||
-          $identifier->getTypeName() == 'n_HEREDOC') {
+      if ($this->isConstantString($identifier)) {
         continue;
       }
 
-      if ($identifier->getTypeName() == 'n_CONCATENATION_LIST') {
-        foreach ($identifier->getChildren() as $child) {
-          if ($child->getTypeName() == 'n_STRING_SCALAR' ||
-              $child->getTypeName() == 'n_OPERATOR') {
-            continue 2;
-          }
-        }
-      }
-
       $this->raiseLintAtNode(
         $call,
         self::LINT_PHT_WITH_DYNAMIC_STRING,
@@ -325,6 +311,42 @@ final class ArcanistXHPASTLinter extends ArcanistLinter {
     }
   }
 
+  private function isConstantString(XHPASTNode $node) {
+    $value = $node->getConcreteString();
+
+    switch ($node->getTypeName()) {
+      case 'n_HEREDOC':
+        if ($value[3] == "'") { // Nowdoc: <<<'EOT'
+          return true;
+        }
+        $value = preg_replace('/^.+\n|\n.*$/', '', $value);
+        break;
+
+      case 'n_STRING_SCALAR':
+        if ($value[0] == "'") {
+          return true;
+        }
+        $value = substr($value, 1, -1);
+        break;
+
+      case 'n_CONCATENATION_LIST':
+        foreach ($node->getChildren() as $child) {
+          if ($child->getTypeName() == 'n_OPERATOR') {
+            continue;
+          }
+          if (!$this->isConstantString($child)) {
+            return false;
+          }
+        }
+        return true;
+
+      default:
+        return false;
+    }
+
+    return preg_match('/^((?>[^$\\\\]*)|\\\\.)*$/s', $value);
+  }
+
   public function lintPHP53Features($root) {
 
     $functions = $root->selectTokensOfType('T_FUNCTION');
diff --git a/src/lint/linter/__tests__/xhpast/pht.lint-test b/src/lint/linter/__tests__/xhpast/pht.lint-test
index b9b1c711..5b99f06f 100644
--- a/src/lint/linter/__tests__/xhpast/pht.lint-test
+++ b/src/lint/linter/__tests__/xhpast/pht.lint-test
@@ -5,7 +5,23 @@ pht('a'.'b');
 pht(f());
 pht();
 pht($a);
+pht('a'.$a);
+pht('$a');
+pht("$a");
 pht('%s', $a);
+
+pht(<<<EOT
+a
+EOT
+);
+
+pht(<<<EOT
+$a
+EOT
+);
 ~~~~~~~~~~
 disabled:5:1
 disabled:7:1
+disabled:8:1
+disabled:10:1
+disabled:18:1