diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -846,7 +846,8 @@
    * This is not a general-purpose proxying method; it is a specialized
    * method with niche applications and severe security implications.
    *
-   * @param string URI $uri identifying the host we are proxying the request to.
+   * @param string $uri URI identifying the host we are proxying the request
+   *   to.
    * @return HTTPSFuture New proxy future.
    *
    * @phutil-external-symbol class PhabricatorStartup
diff --git a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
--- a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
@@ -920,7 +920,7 @@
    * which users have been locked out of.
    *
    * @param PhabricatorUser $user User to generate a URI for.
-   * @param PhabricatorUserEmail? $email Optionally, email to verify when
+   * @param PhabricatorUserEmail|null $email Optionally, email to verify when
    *  link is used.
    * @param string $type (optional) Context string for the URI. This is purely
    *  cosmetic and used only to customize workflow and error messages.
diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
--- a/src/applications/differential/parser/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/DifferentialChangesetParser.php
@@ -1193,7 +1193,7 @@
    * "show more"). The $mask returned is a sparsely populated dictionary
    * of $visible_line_number => true.
    *
-   * @return array($gaps, $mask)
+   * @return array Array of <$gaps, $mask>
    */
   private function calculateGapsAndMask(
     $mask_force,
diff --git a/src/applications/fact/chart/PhabricatorChartStackedAreaDataset.php b/src/applications/fact/chart/PhabricatorChartStackedAreaDataset.php
--- a/src/applications/fact/chart/PhabricatorChartStackedAreaDataset.php
+++ b/src/applications/fact/chart/PhabricatorChartStackedAreaDataset.php
@@ -247,11 +247,12 @@
 
   /**
    * @param PhabricatorChartDataQuery $data_query
-   * @param array<string<epoch<string:int,string:int>>> $point_lists The key is
-   *   the stack (the PhabricatorChartFunctionLabel name of the
+   * @param array<string<int<array<string,int>,array<string,int>>>> $point_lists
+   *   The key is the stack (the PhabricatorChartFunctionLabel name of the
    *   PhabricatorChartFunction (e.g. "created" or "moved-in")) and its value
    *   is an array of keys which are date epochs and their values are another
-   *   array of x:date epoch and y:incremental integer pairs.
+   *   array of x:date epoch and y:incremental integer pairs:
+   *   array <string<epoch<string:int,string:int>>>
    */
   private function getGeometry(
     PhabricatorChartDataQuery $data_query,
diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
--- a/src/applications/maniphest/controller/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/ManiphestReportController.php
@@ -528,10 +528,11 @@
    *    - a possible error.
    * This is used for the "Recently Closed" column on /maniphest/report/*.
    *
-   * @return array<string,integer,string|null> "Recently Means" user input;
+   * @return array Array with three items: "Recently Means" user input;
    *         Resulting epoch timeframe used to get "Recently Closed" numbers
    *         (when user input is invalid, it defaults to a week ago); "Invalid"
    *         if first parameter could not be parsed as an epoch, else null.
+   *         array<string,integer,string|null>
    */
   private function getWindow() {
     $request = $this->getRequest();
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -268,7 +268,7 @@
    * Add Open Graph Protocol metadata tags to Maniphest task page
    * @param PhabricatorStandardPageView $page
    * @param ManiphestTask $task
-   * @return $page with additional OGP <meta> tags
+   * @return PhabricatorStandardPageView with additional OGP <meta> tags
    */
   private function addOpenGraphProtocolMetadataTags($page, $task) {
     foreach ($this->getOpenGraphProtocolMetadataValues($task) as $k => $v) {
diff --git a/src/applications/oauthserver/PhabricatorOAuthServer.php b/src/applications/oauthserver/PhabricatorOAuthServer.php
--- a/src/applications/oauthserver/PhabricatorOAuthServer.php
+++ b/src/applications/oauthserver/PhabricatorOAuthServer.php
@@ -59,7 +59,8 @@
 
   /**
    * @task auth
-   * @return tuple <bool hasAuthorized, ClientAuthorization or null>
+   * @return array<bool,PhabricatorOAuthClientAuthorization|null> Tuple of
+   *   <bool hasAuthorized, ClientAuthorization or null>
    */
   public function userHasAuthorizedClient(array $scope) {
 
diff --git a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
--- a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
@@ -20,7 +20,7 @@
 
   /**
    * With the specified User PHIDs.
-   * @param null|array $phids User PHIDs
+   * @param array<string|null> $phids User PHIDs
    */
   public function withUserPHIDs(array $phids) {
     $this->userPhids = $phids;
diff --git a/src/applications/project/chart/PhabricatorProjectBurndownChartEngine.php b/src/applications/project/chart/PhabricatorProjectBurndownChartEngine.php
--- a/src/applications/project/chart/PhabricatorProjectBurndownChartEngine.php
+++ b/src/applications/project/chart/PhabricatorProjectBurndownChartEngine.php
@@ -103,7 +103,8 @@
   /**
    * @param string $fact_key The key of the new fact sum
    *   (e.g. "tasks.open-count.assign.project")
-   * @param array<string> Project PHIDs
+   * @param array<string> $phids Project PHIDs
+   * @return array
    */
   private function newFactSum($fact_key, array $phids) {
     $result = array();
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -1645,7 +1645,7 @@
    * Load from object and from storage, and updates Custom Fields instances
    * that are attached to each object.
    *
-   * @return map<phid->PhabricatorCustomFieldList> of loaded fields.
+   * @return map Map of of loaded fields (PHID to PhabricatorCustomFieldList).
    * @task custom
    */
   protected function loadCustomFields(array $objects, $role) {
diff --git a/src/infrastructure/diff/PhabricatorDifferenceEngine.php b/src/infrastructure/diff/PhabricatorDifferenceEngine.php
--- a/src/infrastructure/diff/PhabricatorDifferenceEngine.php
+++ b/src/infrastructure/diff/PhabricatorDifferenceEngine.php
@@ -134,7 +134,7 @@
    *
    * @param string $old Entire previous file content.
    * @param string $new Entire current file content.
-   * @return @{class:DifferentialChangeset} Synthetic changeset.
+   * @return DifferentialChangeset Synthetic changeset.
    * @task diff
    */
   public function generateChangesetFromFileContent($old, $new) {