diff --git a/scripts/test/lipsum.php b/scripts/test/lipsum.php
--- a/scripts/test/lipsum.php
+++ b/scripts/test/lipsum.php
@@ -25,10 +25,10 @@
 }
 $class = reset($class);
 
-$symbols = id(new PhutilSymbolLoader())
+$symbols = id(new PhutilClassMapQuery())
   ->setAncestorClass('PhutilContextFreeGrammar')
-  ->setConcreteOnly(true)
-  ->selectAndLoadSymbols();
+  ->execute();
+
 $symbols = ipull($symbols, 'name', 'name');
 
 if (empty($symbols[$class])) {
diff --git a/src/internationalization/PhutilLocale.php b/src/internationalization/PhutilLocale.php
--- a/src/internationalization/PhutilLocale.php
+++ b/src/internationalization/PhutilLocale.php
@@ -106,10 +106,11 @@
    */
   public static function loadAllLocales() {
     static $locales;
+
     if ($locales === null) {
-      $objects = id(new PhutilSymbolLoader())
+      $objects = id(new PhutilClassMapQuery())
         ->setAncestorClass(__CLASS__)
-        ->loadObjects();
+        ->execute();
 
       $locale_map = array();
       foreach ($objects as $object) {
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupInterpreterBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupInterpreterBlockRule.php
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupInterpreterBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupInterpreterBlockRule.php
@@ -40,9 +40,9 @@
       $argv = id(new PhutilSimpleOptions())->parse($matches[2]);
     }
 
-    $interpreters = id(new PhutilSymbolLoader())
+    $interpreters = id(new PhutilClassMapQuery())
       ->setAncestorClass('PhutilRemarkupBlockInterpreter')
-      ->loadObjects();
+      ->execute();
 
     foreach ($interpreters as $interpreter) {
       $interpreter->setEngine($this->getEngine());