diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -12,6 +12,9 @@
  * @task order Result Ordering
  * @task edgelogic Working with Edge Logic
  * @task spaces Working with Spaces
+ *
+ * @template R of PhabricatorPolicyInterface
+ * @extends PhabricatorPolicyAwareQuery<R>
  */
 abstract class PhabricatorCursorPagedPolicyAwareQuery
   extends PhabricatorPolicyAwareQuery {
@@ -439,6 +442,9 @@
     return null;
   }
 
+  /**
+   * @return R|null
+   */
   public function newResultObject() {
     return null;
   }
diff --git a/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
--- a/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorPolicyAwareQuery.php
@@ -25,6 +25,8 @@
  * @task config     Query Configuration
  * @task exec       Executing Queries
  * @task policyimpl Policy Query Implementation
+ *
+ * @template R of PhabricatorPolicyInterface
  */
 abstract class PhabricatorPolicyAwareQuery extends PhabricatorOffsetPagedQuery {
 
@@ -170,7 +172,7 @@
    * example, the user is trying to view or edit an object which exists but
    * which they do not have permission to see) a policy exception is thrown.
    *
-   * @return mixed Single result, or null.
+   * @return R|null Single result, or null.
    * @task exec
    */
   final public function executeOne() {
@@ -198,7 +200,7 @@
   /**
    * Execute the query, loading all visible results.
    *
-   * @return list<PhabricatorPolicyInterface> Result objects.
+   * @return R[] Result objects.
    * @task exec
    */
   final public function execute() {
@@ -473,7 +475,7 @@
    * automatically populated as a side effect of objects surviving policy
    * filtering.
    *
-   * @param map<phid, PhabricatorPolicyInterface> $objects Objects to add to
+   * @param array<phid, PhabricatorPolicyInterface> $objects Objects to add to
    *   the query workspace.
    * @return $this
    * @task workspace
@@ -552,7 +554,7 @@
    *
    * PHIDs which are "in flight" are actively being queried for.
    *
-   * @return map<string, string> PHIDs currently in flight.
+   * @return array<string, string> PHIDs currently in flight.
    */
   public function getPHIDsInFlight() {
     $results = $this->inFlightPHIDs;
@@ -595,7 +597,7 @@
    * from the database. They should attempt to return the number of results
    * hinted by @{method:getRawResultLimit}.
    *
-   * @return list<PhabricatorPolicyInterface> List of filterable policy objects.
+   * @return R[] List of filterable policy objects.
    * @task policyimpl
    */
   abstract protected function loadPage();
@@ -606,7 +608,7 @@
    * return new results. Generally, you should adjust a cursor position based
    * on the provided result page.
    *
-   * @param list<PhabricatorPolicyInterface> $page The current page of results.
+   * @param R[] $page The current page of results.
    * @return void
    * @task policyimpl
    */
@@ -627,8 +629,8 @@
    * This method will only be called if data is available. Implementations
    * do not need to handle the case of no results specially.
    *
-   * @param   list<wild>  $page Results from `loadPage()`.
-   * @return  list<PhabricatorPolicyInterface> Objects for policy filtering.
+   * @param   R[]  $page Results from `loadPage()`.
+   * @return  R[] Objects for policy filtering.
    * @task policyimpl
    */
   protected function willFilterPage(array $page) {
@@ -650,8 +652,8 @@
    * This method will only be called if data is available. Implementations do
    * not need to handle the case of no results specially.
    *
-   * @param list<wild> $page Results from @{method:willFilterPage()}.
-   * @return list<PhabricatorPolicyInterface> Objects after additional
+   * @param R[] $page Results from @{method:willFilterPage()}.
+   * @return R[] Objects after additional
    *   non-policy processing.
    */
   protected function didFilterPage(array $page) {
@@ -665,7 +667,7 @@
    * filtered for policy reasons. The query should remove them from any cached
    * or partial result sets.
    *
-   * @param list<wild>  $results List of objects that should not be returned by
+   * @param R[]  $results List of objects that should not be returned by
    *                    alternate result mechanisms.
    * @return void
    * @task policyimpl
@@ -680,8 +682,8 @@
    * used by @{class:PhabricatorCursorPagedPolicyAwareQuery} to reverse results
    * that are queried during reverse paging.
    *
-   * @param   list<PhabricatorPolicyInterface> $results Query results.
-   * @return  list<PhabricatorPolicyInterface> Final results.
+   * @param   R[] $results Query results.
+   * @return  R[] Final results.
    * @task policyimpl
    */
   protected function didLoadResults(array $results) {
diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php
--- a/src/view/control/AphrontCursorPagerView.php
+++ b/src/view/control/AphrontCursorPagerView.php
@@ -70,6 +70,11 @@
     return $this->prevPageID;
   }
 
+  /**
+   * @param T[] $results
+   * @return T[]
+   * @template T
+   */
   public function sliceResults(array $results) {
     if (count($results) > $this->getPageSize()) {
       $page_size = (int)$this->getPageSize();