diff --git a/resources/test/diverse_symbols.php b/resources/test/diverse_symbols.php
--- a/resources/test/diverse_symbols.php
+++ b/resources/test/diverse_symbols.php
@@ -14,7 +14,7 @@
 
 function f() {}
 
-(function () {
+(function() {
   // Anonymous function.
 });
 
@@ -44,13 +44,13 @@
 
 // Various magic things.
 
-die($x);
+exit($x);
 empty($x);
 isset($x);
-echo($x);
+echo $x;
 print($x);
 exit($x);
-include($x);
-include_once($x);
-require($x);
-require_once($x);
+include $x;
+include_once $x;
+require $x;
+require_once $x;
diff --git a/src/utils/__tests__/PhutilUtilsTestCase.php b/src/utils/__tests__/PhutilUtilsTestCase.php
--- a/src/utils/__tests__/PhutilUtilsTestCase.php
+++ b/src/utils/__tests__/PhutilUtilsTestCase.php
@@ -231,7 +231,7 @@
       'InvalidArgumentException');
   }
 
-  public function testAssertStringLike () {
+  public function testAssertStringLike() {
     $this->assertEqual(
       null,
       assert_stringlike(null));
diff --git a/src/utils/utf8.php b/src/utils/utf8.php
--- a/src/utils/utf8.php
+++ b/src/utils/utf8.php
@@ -738,7 +738,7 @@
       unset($components[$index]);
       $components = array_values($components);
 
-      $index --;
+      $index--;
       $array_length = count($components);
     }
   }