diff --git a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php b/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
index aa69420a1f..4da7ea92f1 100644
--- a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
+++ b/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
@@ -47,6 +47,7 @@ abstract class AphrontApplicationConfiguration {
 
   final public function setConsole($console) {
     $this->console = $console;
+    return $this;
   }
 
   final public function buildController() {
diff --git a/src/aphront/request/AphrontRequest.php b/src/aphront/request/AphrontRequest.php
index d7f5fe8be5..22a6714b58 100644
--- a/src/aphront/request/AphrontRequest.php
+++ b/src/aphront/request/AphrontRequest.php
@@ -289,6 +289,8 @@ final class AphrontRequest {
       $base_domain,
       $is_secure,
       $http_only = true);
+
+    return $this;
   }
 
   final public function setUser($user) {
diff --git a/src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php b/src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php
index aaebcbec0c..c33b5f746d 100644
--- a/src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php
+++ b/src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,12 @@ final class PhabricatorDaemonLogEventsView extends AphrontView {
 
   public function setEvents(array $events) {
     $this->events = $events;
+    return $this;
   }
 
   public function setCombinedLog($is_combined) {
     $this->combinedLog = $is_combined;
+    return $this;
   }
 
   public function setUser(PhabricatorUser $user) {
diff --git a/src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php
index 3f9abb8cdd..02ae2b4557 100644
--- a/src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php
+++ b/src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ final class PhabricatorDaemonLogListView extends AphrontView {
 
   public function setDaemonLogs(array $daemon_logs) {
     $this->daemonLogs = $daemon_logs;
+    return $this;
   }
 
   public function setUser(PhabricatorUser $user) {
diff --git a/src/applications/differential/view/addcomment/DifferentialAddCommentView.php b/src/applications/differential/view/addcomment/DifferentialAddCommentView.php
index 5d8c57a581..97a425eda6 100644
--- a/src/applications/differential/view/addcomment/DifferentialAddCommentView.php
+++ b/src/applications/differential/view/addcomment/DifferentialAddCommentView.php
@@ -36,10 +36,12 @@ final class DifferentialAddCommentView extends AphrontView {
 
   public function setActionURI($uri) {
     $this->actionURI = $uri;
+    return $this;
   }
 
   public function setUser(PhabricatorUser $user) {
     $this->user = $user;
+    return $this;
   }
 
   public function setDraft($draft) {
diff --git a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
index 930abcaa83..e420afa57d 100644
--- a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
+++ b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
@@ -58,6 +58,7 @@ final class DifferentialInlineCommentView extends AphrontView {
 
   public function setPreview($preview) {
     $this->preview = $preview;
+    return $this;
   }
 
   public function render() {
diff --git a/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php b/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
index 17d7668237..6b291c348f 100644
--- a/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
@@ -109,6 +109,7 @@ abstract class DiffusionFileContentQuery extends DiffusionQuery {
 
   public function setNeedsBlame($needs_blame) {
     $this->needsBlame = $needs_blame;
+    return $this;
   }
 
   public function getNeedsBlame() {
diff --git a/src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php b/src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php
index ce1023ef0f..a6a0144471 100644
--- a/src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php
+++ b/src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php
@@ -23,10 +23,12 @@ final class DiffusionEmptyResultView extends DiffusionView {
 
   public function setBrowseQuery($browse_query) {
     $this->browseQuery = $browse_query;
+    return $this;
   }
 
   public function setView($view) {
     $this->view = $view;
+    return $this;
   }
 
   public function render() {
diff --git a/src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php b/src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php
index 0da07f8ead..92a119b149 100644
--- a/src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php
+++ b/src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php
@@ -31,6 +31,7 @@ abstract class ManiphestAuxiliaryFieldSpecification {
 
   public function setLabel($val) {
     $this->label = $val;
+    return $this;
   }
 
   public function getLabel() {
@@ -39,6 +40,7 @@ abstract class ManiphestAuxiliaryFieldSpecification {
 
   public function setAuxiliaryKey($val) {
     $this->auxiliaryKey = $val;
+    return $this;
   }
 
   public function getAuxiliaryKey() {
@@ -47,6 +49,7 @@ abstract class ManiphestAuxiliaryFieldSpecification {
 
   public function setCaption($val) {
     $this->caption = $val;
+    return $this;
   }
 
   public function getCaption() {
@@ -55,6 +58,7 @@ abstract class ManiphestAuxiliaryFieldSpecification {
 
   public function setValue($val) {
     $this->value = $val;
+    return $this;
   }
 
   public function getValue() {
@@ -69,9 +73,9 @@ abstract class ManiphestAuxiliaryFieldSpecification {
     return false;
   }
 
-  public function setType($val)
-  {
+  public function setType($val) {
     $this->type = $val;
+    return $this;
   }
 
   public function getType() {
diff --git a/src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php b/src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php
index 90db5fd9bf..658fd1f6d3 100644
--- a/src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php
+++ b/src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php
@@ -134,7 +134,7 @@ class ManiphestAuxiliaryFieldDefaultSpecification
 
   public function setValueFromRequest($request) {
     $aux_post_values = $request->getArr('auxiliary');
-    $this->setValue(idx($aux_post_values, $this->getAuxiliaryKey(), ''));
+    return $this->setValue(idx($aux_post_values, $this->getAuxiliaryKey(), ''));
   }
 
   public function getValueForStorage() {
@@ -142,7 +142,7 @@ class ManiphestAuxiliaryFieldDefaultSpecification
   }
 
   public function setValueFromStorage($value) {
-    $this->setValue($value);
+    return $this->setValue($value);
   }
 
   public function validate() {
diff --git a/src/applications/project/editor/project/PhabricatorProjectEditor.php b/src/applications/project/editor/project/PhabricatorProjectEditor.php
index ab6e92a9d0..00ee8478e8 100644
--- a/src/applications/project/editor/project/PhabricatorProjectEditor.php
+++ b/src/applications/project/editor/project/PhabricatorProjectEditor.php
@@ -157,6 +157,7 @@ final class PhabricatorProjectEditor {
       default:
         throw new Exception("Unknown transaction type '{$type}'!");
     }
+    return $this;
   }
 
   private function applyTransactionEffect(
diff --git a/src/infrastructure/celerity/graph/CelerityResourceGraph.php b/src/infrastructure/celerity/graph/CelerityResourceGraph.php
index 81b2dfbae8..9d6c8f6865 100644
--- a/src/infrastructure/celerity/graph/CelerityResourceGraph.php
+++ b/src/infrastructure/celerity/graph/CelerityResourceGraph.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ final class CelerityResourceGraph extends AbstractDirectedGraph {
   final public function setResourceGraph(array $graph) {
     $this->resourceGraph = $graph;
     $this->graphSet = true;
+    return $this;
   }
 
   private function getResourceGraph() {
diff --git a/src/infrastructure/celerity/map/CelerityResourceMap.php b/src/infrastructure/celerity/map/CelerityResourceMap.php
index 5d0ec732fc..5e79b883ca 100644
--- a/src/infrastructure/celerity/map/CelerityResourceMap.php
+++ b/src/infrastructure/celerity/map/CelerityResourceMap.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ final class CelerityResourceMap {
 
   public function setPackageMap($package_map) {
     $this->packageMap = $package_map;
+    return $this;
   }
 
   public function packageResources(array $resolved_map) {
diff --git a/src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php b/src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php
index 2eb411024e..618ddab704 100644
--- a/src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php
+++ b/src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ final class AphrontHeadsupActionListView extends AphrontView {
 
   public function setActions(array $actions) {
     $this->actions = $actions;
+    return $this;
   }
 
   public function render() {