diff --git a/scripts/repository/commit_hook.php b/scripts/repository/commit_hook.php
index ccbfde08ff..28829edeb2 100755
--- a/scripts/repository/commit_hook.php
+++ b/scripts/repository/commit_hook.php
@@ -119,7 +119,7 @@ if ($is_svnrevprop) {
   exit($err);
 } else if ($repository->isGit() || $repository->isHg()) {
   $username = getenv(DiffusionCommitHookEngine::ENV_USER);
-  if (!strlen($username)) {
+  if (!phutil_nonempty_string($username)) {
     throw new Exception(
       pht(
         'No Direct Pushes: You are pushing directly to a hosted repository. '.
@@ -181,17 +181,17 @@ $engine->setStdin($stdin);
 $engine->setOriginalArgv(array_slice($argv, 2));
 
 $remote_address = getenv(DiffusionCommitHookEngine::ENV_REMOTE_ADDRESS);
-if (strlen($remote_address)) {
+if (phutil_nonempty_string($remote_address)) {
   $engine->setRemoteAddress($remote_address);
 }
 
 $remote_protocol = getenv(DiffusionCommitHookEngine::ENV_REMOTE_PROTOCOL);
-if (strlen($remote_protocol)) {
+if (phutil_nonempty_string($remote_protocol)) {
   $engine->setRemoteProtocol($remote_protocol);
 }
 
 $request_identifier = getenv(DiffusionCommitHookEngine::ENV_REQUEST);
-if (strlen($request_identifier)) {
+if (phutil_nonempty_string($request_identifier)) {
   $engine->setRequestIdentifier($request_identifier);
 }
 
diff --git a/scripts/ssh/ssh-auth.php b/scripts/ssh/ssh-auth.php
index 45e9a823db..2b3b52cf4b 100755
--- a/scripts/ssh/ssh-auth.php
+++ b/scripts/ssh/ssh-auth.php
@@ -36,7 +36,7 @@ $authstruct_raw = $cache->getKey($authstruct_key);
 
 $authstruct = null;
 
-if (strlen($authstruct_raw)) {
+if (phutil_nonempty_string($authstruct_raw)) {
   try {
     $authstruct = phutil_json_decode($authstruct_raw);
   } catch (Exception $ex) {
@@ -82,13 +82,13 @@ if ($authstruct === null) {
     // Strip out newlines and other nonsense from the key type and key body.
     $type = $ssh_key->getKeyType();
     $type = preg_replace('@[\x00-\x20]+@', '', $type);
-    if (!strlen($type)) {
+    if (!phutil_nonempty_string($type)) {
       continue;
     }
 
     $key = $ssh_key->getKeyBody();
     $key = preg_replace('@[\x00-\x20]+@', '', $key);
-    if (!strlen($key)) {
+    if (!phutil_nonempty_string($key)) {
       continue;
     }
 
@@ -135,7 +135,7 @@ foreach ($authstruct['keys'] as $key_struct) {
 
   $cmd = csprintf('%s %Ls', $bin, $key_argv);
 
-  if (strlen($instance)) {
+  if (phutil_nonempty_string($instance)) {
     $cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
   }
 
diff --git a/scripts/ssh/ssh-exec.php b/scripts/ssh/ssh-exec.php
index 70c95d28da..7b5b6adb8f 100755
--- a/scripts/ssh/ssh-exec.php
+++ b/scripts/ssh/ssh-exec.php
@@ -103,7 +103,7 @@ try {
         '--phabricator-ssh-device',
         $user_name,
         $device_name));
-  } else if (strlen($user_name)) {
+  } else if (phutil_nonempty_string($user_name)) {
     $user = id(new PhabricatorPeopleQuery())
       ->setViewer(PhabricatorUser::getOmnipotentUser())
       ->withUsernames(array($user_name))
@@ -117,7 +117,7 @@ try {
 
     id(new PhabricatorAuthSessionEngine())
       ->willServeRequestForUser($user);
-  } else if (strlen($device_name)) {
+  } else if (phutil_nonempty_string($device_name)) {
     if (!$remote_address) {
       throw new Exception(
         pht(
diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php
index e93b0c5cbc..13972385ab 100755
--- a/scripts/symbols/generate_ctags_symbols.php
+++ b/scripts/symbols/generate_ctags_symbols.php
@@ -39,7 +39,7 @@ $data = array();
 $futures = array();
 
 foreach (explode("\n", trim($input)) as $file) {
-  if (!strlen($file)) {
+  if (!phutil_nonempty_string($file)) {
     continue;
   }
 
diff --git a/scripts/symbols/generate_php_symbols.php b/scripts/symbols/generate_php_symbols.php
index af87d580d8..cc8cab3817 100755
--- a/scripts/symbols/generate_php_symbols.php
+++ b/scripts/symbols/generate_php_symbols.php
@@ -27,7 +27,7 @@ $data = array();
 $futures = array();
 
 foreach (explode("\n", trim($input)) as $file) {
-  if (!strlen($file)) {
+  if (!phutil_nonempty_string($file)) {
     continue;
   }
 
diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
index f35f3f1279..58fc6f9346 100644
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -66,7 +66,7 @@ final class AphrontRequest extends Phobject {
   }
 
   public static function parseURILineRange($range, $limit) {
-    if (!strlen($range)) {
+    if (!phutil_nonempty_string($range)) {
       return null;
     }
 
@@ -234,7 +234,7 @@ final class AphrontRequest extends Phobject {
 
     $raw_data = phutil_string_cast($this->requestData[$name]);
     $raw_data = trim($raw_data);
-    if (!strlen($raw_data)) {
+    if (!phutil_nonempty_string($raw_data)) {
       return $default;
     }
 
@@ -499,7 +499,7 @@ final class AphrontRequest extends Phobject {
     // domain is. This makes setup easier, and we'll tell administrators to
     // configure a base domain during the setup process.
     $base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
-    if (!strlen($base_uri)) {
+    if (!phutil_nonempty_string($base_uri)) {
       return new PhutilURI('http://'.$host.'/');
     }
 
@@ -956,7 +956,7 @@ final class AphrontRequest extends Phobject {
     $submit_cookie = PhabricatorCookies::COOKIE_SUBMIT;
 
     $submit_key = $this->getCookie($submit_cookie);
-    if (strlen($submit_key)) {
+    if (phutil_nonempty_string($submit_key)) {
       $this->clearCookie($submit_cookie);
       $this->submitKey = $submit_key;
     }
diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index 550a5a0316..3bdd2c00bc 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -823,7 +823,7 @@ final class AphrontApplicationConfiguration
     $raw_input = PhabricatorStartup::getRawInput();
     $parser = new PhutilQueryStringParser();
 
-    if (strlen($raw_input)) {
+    if (phutil_nonempty_string($raw_input)) {
       $content_type = idx($_SERVER, 'CONTENT_TYPE');
       $is_multipart = preg_match('@^multipart/form-data@i', $content_type);
       if ($is_multipart) {
diff --git a/src/aphront/response/AphrontAjaxResponse.php b/src/aphront/response/AphrontAjaxResponse.php
index 2187defc8f..b9e60809fc 100644
--- a/src/aphront/response/AphrontAjaxResponse.php
+++ b/src/aphront/response/AphrontAjaxResponse.php
@@ -64,7 +64,7 @@ final class AphrontAjaxResponse extends AphrontResponse {
       if ($viewer) {
         $postprocessor_key = $viewer->getUserSetting(
           PhabricatorAccessibilitySetting::SETTINGKEY);
-        if (strlen($postprocessor_key)) {
+        if (phutil_nonempty_string($postprocessor_key)) {
           $response->setPostprocessorKey($postprocessor_key);
         }
       }
diff --git a/src/aphront/response/AphrontFileResponse.php b/src/aphront/response/AphrontFileResponse.php
index 6bae4c808f..980d1ee5dd 100644
--- a/src/aphront/response/AphrontFileResponse.php
+++ b/src/aphront/response/AphrontFileResponse.php
@@ -19,7 +19,7 @@ final class AphrontFileResponse extends AphrontResponse {
   }
 
   public function setDownload($download) {
-    if (!strlen($download)) {
+    if (!phutil_nonempty_string($download)) {
       $download = 'untitled';
     }
     $this->download = $download;
diff --git a/src/aphront/response/AphrontWebpageResponse.php b/src/aphront/response/AphrontWebpageResponse.php
index de642f9b19..00a953ece8 100644
--- a/src/aphront/response/AphrontWebpageResponse.php
+++ b/src/aphront/response/AphrontWebpageResponse.php
@@ -21,7 +21,7 @@ final class AphrontWebpageResponse extends AphrontHTMLResponse {
 
   public function buildResponseString() {
     $unexpected_output = $this->getUnexpectedOutput();
-    if (strlen($unexpected_output)) {
+    if (phutil_nonempty_string($unexpected_output)) {
       $style = array(
         'background: linear-gradient(180deg, #eeddff, #ddbbff);',
         'white-space: pre-wrap;',
diff --git a/src/aphront/sink/AphrontPHPHTTPSink.php b/src/aphront/sink/AphrontPHPHTTPSink.php
index 4953b6e610..1aaa1810ff 100644
--- a/src/aphront/sink/AphrontPHPHTTPSink.php
+++ b/src/aphront/sink/AphrontPHPHTTPSink.php
@@ -8,7 +8,7 @@ final class AphrontPHPHTTPSink extends AphrontHTTPSink {
   protected function emitHTTPStatus($code, $message = '') {
     if ($code != 200) {
       $header = "HTTP/1.0 {$code}";
-      if (strlen($message)) {
+      if (phutil_nonempty_string($message)) {
         $header .= " {$message}";
       }
       header($header);
diff --git a/src/aphront/site/AphrontSite.php b/src/aphront/site/AphrontSite.php
index 85bf42fe6c..08813462c6 100644
--- a/src/aphront/site/AphrontSite.php
+++ b/src/aphront/site/AphrontSite.php
@@ -15,7 +15,7 @@ abstract class AphrontSite extends Phobject {
 
   protected function isHostMatch($host, array $uris) {
     foreach ($uris as $uri) {
-      if (!strlen($uri)) {
+      if (!phutil_nonempty_string($uri)) {
         continue;
       }
 
diff --git a/src/aphront/site/PhabricatorPlatformSite.php b/src/aphront/site/PhabricatorPlatformSite.php
index a3193e65d1..e6c733684b 100644
--- a/src/aphront/site/PhabricatorPlatformSite.php
+++ b/src/aphront/site/PhabricatorPlatformSite.php
@@ -14,7 +14,7 @@ final class PhabricatorPlatformSite extends PhabricatorSite {
     // If no base URI has been configured yet, match this site so the user
     // can follow setup instructions.
     $base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
-    if (!strlen($base_uri)) {
+    if (!phutil_nonempty_string($base_uri)) {
       return new PhabricatorPlatformSite();
     }
 
diff --git a/src/aphront/site/PhabricatorResourceSite.php b/src/aphront/site/PhabricatorResourceSite.php
index 88f7777607..3fca474a17 100644
--- a/src/aphront/site/PhabricatorResourceSite.php
+++ b/src/aphront/site/PhabricatorResourceSite.php
@@ -14,7 +14,7 @@ final class PhabricatorResourceSite extends PhabricatorSite {
     $host = $request->getHost();
 
     $uri = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
-    if (!strlen($uri)) {
+    if (!phutil_nonempty_string($uri)) {
       return null;
     }
 
diff --git a/src/aphront/site/PhabricatorShortSite.php b/src/aphront/site/PhabricatorShortSite.php
index d4c36aecbe..05cf2c3584 100644
--- a/src/aphront/site/PhabricatorShortSite.php
+++ b/src/aphront/site/PhabricatorShortSite.php
@@ -14,7 +14,7 @@ final class PhabricatorShortSite extends PhabricatorSite {
     $host = $request->getHost();
 
     $uri = PhabricatorEnv::getEnvConfig('phurl.short-uri');
-    if (!strlen($uri)) {
+    if (!phutil_nonempty_string($uri)) {
       return null;
     }
 
diff --git a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
index 9247966d75..4a9cfbb8a6 100644
--- a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
+++ b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
@@ -43,7 +43,7 @@ final class PhabricatorProjectProjectPHIDType extends PhabricatorPHIDType {
 
       $handle->setName($name);
 
-      if (strlen($slug)) {
+      if (phutil_nonempty_string($slug)) {
         $handle->setObjectName('#'.$slug);
         $handle->setMailStampName('#'.$slug);
         $handle->setURI("/tag/{$slug}/");
diff --git a/support/startup/preamble-utils.php b/support/startup/preamble-utils.php
index 8dd3b502d6..dfb5619a43 100644
--- a/support/startup/preamble-utils.php
+++ b/support/startup/preamble-utils.php
@@ -21,7 +21,7 @@ function preamble_trust_x_forwarded_for_header($layers = 1) {
   }
 
   $forwarded_for = $_SERVER['HTTP_X_FORWARDED_FOR'];
-  if (!strlen($forwarded_for)) {
+  if (!phutil_nonempty_string($forwarded_for)) {
     return;
   }