diff --git a/src/applications/console/controller/DarkConsoleDataController.php b/src/applications/console/controller/DarkConsoleDataController.php
index 4b7c3dedaa..fd5350679d 100644
--- a/src/applications/console/controller/DarkConsoleDataController.php
+++ b/src/applications/console/controller/DarkConsoleDataController.php
@@ -61,7 +61,7 @@ final class DarkConsoleDataController extends PhabricatorController {
 
         // Because cookie names can now be prefixed, wipe out any cookie value
         // with the session cookie name anywhere in its name.
-        $pattern = '#'.preg_quote(PhabricatorCookies::COOKIE_SESSION, '#').'#';
+        $pattern = '('.preg_quote(PhabricatorCookies::COOKIE_SESSION).')';
         foreach ($_COOKIE as $cookie_name => $cookie_value) {
           if (preg_match($pattern, $cookie_name)) {
             $panel = PhutilSafeHTML::applyFunction(
diff --git a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
index 8a26461e75..7f211c3654 100644
--- a/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
+++ b/src/infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php
@@ -163,15 +163,15 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
 
   private function getObjectEmbedPattern() {
     $prefix = $this->getObjectNamePrefix();
-    $prefix = preg_quote($prefix, '#');
+    $prefix = preg_quote($prefix);
     $id = $this->getObjectIDPattern();
 
-    return '#\B{'.$prefix.'('.$id.')([,\s](?:[^}\\\\]|\\\\.)*)?}\B#u';
+    return '(\B{'.$prefix.'('.$id.')([,\s](?:[^}\\\\]|\\\\.)*)?}\B)u';
   }
 
   private function getObjectReferencePattern() {
     $prefix = $this->getObjectNamePrefix();
-    $prefix = preg_quote($prefix, '@');
+    $prefix = preg_quote($prefix);
 
     $id = $this->getObjectIDPattern();
 
@@ -192,7 +192,7 @@ abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
     // The "\b" allows us to link "(abcdef)" or similar without linking things
     // in the middle of words.
 
-    return '@(?<![#-])'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?(?!\w)@u';
+    return '((?<![#-])'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?(?!\w))u';
   }