diff --git a/src/applications/drydock/util/DrydockBlueprintScopeGuard.php b/src/applications/drydock/util/DrydockBlueprintScopeGuard.php
index 6f4564789c..343428683b 100644
--- a/src/applications/drydock/util/DrydockBlueprintScopeGuard.php
+++ b/src/applications/drydock/util/DrydockBlueprintScopeGuard.php
@@ -1,13 +1,15 @@
 <?php
 
 final class DrydockBlueprintScopeGuard extends Phobject {
 
+  private $blueprint;
+
   public function __construct(DrydockBlueprintImplementation $blueprint) {
     $this->blueprint = $blueprint;
   }
 
   public function __destruct() {
     $this->blueprint->popActiveScope();
   }
 
 }
diff --git a/src/applications/releeph/view/branch/ReleephBranchTemplate.php b/src/applications/releeph/view/branch/ReleephBranchTemplate.php
index d1564c55bb..f29e7a9fc2 100644
--- a/src/applications/releeph/view/branch/ReleephBranchTemplate.php
+++ b/src/applications/releeph/view/branch/ReleephBranchTemplate.php
@@ -1,200 +1,195 @@
 <?php
 
 final class ReleephBranchTemplate extends Phobject {
 
   const KEY = 'releeph.default-branch-template';
 
   private $commitHandle;
-  private $branchDate;
+  private $branchDate = null;
   private $projectName;
   private $isSymbolic;
 
   public static function getDefaultTemplate() {
     return PhabricatorEnv::getEnvConfig(self::KEY);
   }
 
   public static function getRequiredDefaultTemplate() {
     $template = self::getDefaultTemplate();
     if (!$template) {
       throw new Exception(pht(
         "Config setting '%s' must be set, ".
         "or you must provide a branch-template for each project!",
         self::KEY));
     }
     return $template;
   }
 
   public static function getFakeCommitHandleFor(
     $repository_phid,
     PhabricatorUser $viewer) {
 
     $repository = id(new PhabricatorRepositoryQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($repository_phid))
       ->executeOne();
 
     $fake_handle = 'SOFAKE';
     if ($repository) {
       $fake_handle = id(new PhabricatorObjectHandle())
         ->setName($repository->formatCommitName('100000000000'));
     }
     return $fake_handle;
   }
 
-  private $commitHandle;
-  private $branchDate = null;
-  private $projectName;
-  private $isSymbolic;
-
   public function setCommitHandle(PhabricatorObjectHandle $handle) {
     $this->commitHandle = $handle;
     return $this;
   }
 
   public function setBranchDate($branch_date) {
     $this->branchDate = $branch_date;
     return $this;
   }
 
   public function setReleephProjectName($project_name) {
     $this->projectName = $project_name;
     return $this;
   }
 
   public function setSymbolic($is_symbolic) {
     $this->isSymbolic = $is_symbolic;
     return $this;
   }
 
   public function interpolate($template) {
     if (!$this->projectName) {
       return array('', array());
     }
 
     list($name, $name_errors) = $this->interpolateInner(
       $template,
       $this->isSymbolic);
 
     if ($this->isSymbolic) {
       return array($name, $name_errors);
     } else {
       $validate_errors = $this->validateAsBranchName($name);
       $errors = array_merge($name_errors, $validate_errors);
       return array($name, $errors);
     }
   }
 
   /*
    * xsprintf() would be useful here, but that's for formatting concrete lists
    * of things in a certain way...
    *
    *    animal_printf('%A %A %A', $dog1, $dog2, $dog3);
    *
    * ...rather than interpolating percent-control-strings like strftime does.
    */
   private function interpolateInner($template, $is_symbolic) {
     $name = $template;
     $errors = array();
 
     $safe_project_name = str_replace(' ', '-', $this->projectName);
     $short_commit_id = last(
       preg_split('/r[A-Z]+/', $this->commitHandle->getName()));
 
     $interpolations = array();
     for ($ii = 0; $ii < strlen($name); $ii++) {
       $char = substr($name, $ii, 1);
       $prev = null;
       if ($ii > 0) {
         $prev = substr($name, $ii - 1, 1);
       }
       $next = substr($name, $ii + 1, 1);
       if ($next && $char == '%' && $prev != '%') {
         $interpolations[$ii] = $next;
       }
     }
 
     $variable_interpolations = array();
 
     $reverse_interpolations = $interpolations;
     krsort($reverse_interpolations);
 
     if ($this->branchDate) {
       $branch_date = $this->branchDate;
     } else {
       $branch_date = $this->commitHandle->getTimestamp();
     }
 
     foreach ($reverse_interpolations as $position => $code) {
       $replacement = null;
       switch ($code) {
         case 'v':
           $replacement = $this->commitHandle->getName();
           $is_variable = true;
           break;
 
         case 'V':
           $replacement = $short_commit_id;
           $is_variable = true;
           break;
 
         case 'P':
           $replacement = $safe_project_name;
           $is_variable = false;
           break;
 
         case 'p':
           $replacement = strtolower($safe_project_name);
           $is_variable = false;
           break;
 
         default:
           // Format anything else using strftime()
           $replacement = strftime("%{$code}", $branch_date);
           $is_variable = true;
           break;
       }
 
       if ($is_variable) {
         $variable_interpolations[] = $code;
       }
       $name = substr_replace($name, $replacement, $position, 2);
     }
 
     if (!$is_symbolic && !$variable_interpolations) {
       $errors[] = pht("Include additional interpolations that aren't static!");
     }
 
     return array($name, $errors);
   }
 
   private function validateAsBranchName($name) {
     $errors = array();
 
     if (preg_match('{^/}', $name) || preg_match('{/$}', $name)) {
       $errors[] = pht("Branches cannot begin or end with '%s'", '/');
     }
 
     if (preg_match('{//+}', $name)) {
       $errors[] = pht("Branches cannot contain multiple consecutive '%s'", '/');
     }
 
     $parts = array_filter(explode('/', $name));
     foreach ($parts as $index => $part) {
       $part_error = null;
       if (preg_match('{^\.}', $part) || preg_match('{\.$}', $part)) {
         $errors[] = pht("Path components cannot begin or end with '%s'", '.');
       } else if (preg_match('{^(?!\w)}', $part)) {
         $errors[] = pht('Path components must begin with an alphanumeric.');
       } else if (!preg_match('{^\w ([\w-_%\.]* [\w-_%])?$}x', $part)) {
         $errors[] = pht(
           "Path components may only contain alphanumerics ".
           "or '%s', '%s' or '%s'.",
           '-',
           '_',
           '.');
       }
     }
 
     return $errors;
   }
 }