diff --git a/src/applications/fact/extract/PhabricatorFactUpdateIterator.php b/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
index df77f4dd33..c0d229084f 100644
--- a/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
+++ b/src/applications/fact/extract/PhabricatorFactUpdateIterator.php
@@ -12,11 +12,8 @@ final class PhabricatorFactUpdateIterator extends PhutilBufferedIterator {
   private $position;
   private $ignoreUpdatesDuration = 15;
 
-  private $set;
-
   public function __construct(LiskDAO $object) {
-    $this->set = new LiskDAOSet();
-    $this->object = $object->putInSet($this->set);
+    $this->object = $object;
   }
 
   public function setPosition($position) {
@@ -41,8 +38,6 @@ final class PhabricatorFactUpdateIterator extends PhutilBufferedIterator {
   }
 
   protected function loadPage() {
-    $this->set->clearSet();
-
     if ($this->object->hasProperty('dateModified')) {
       if ($this->cursor) {
         list($after_epoch, $after_id) = explode(':', $this->cursor);
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
index 131dc7c588..542b685e29 100644
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -163,14 +163,7 @@ final class PhabricatorPeopleQuery
   }
 
   protected function loadPage() {
-    $table = new PhabricatorUser();
-    $data = $this->loadStandardPageRows($table);
-
-    if ($this->needPrimaryEmail) {
-      $table->putInSet(new LiskDAOSet());
-    }
-
-    return $table->loadAllFromArray($data);
+    return $this->loadStandardPage($this->newResultObject());
   }
 
   protected function didFilterPage(array $users) {
diff --git a/src/infrastructure/storage/lisk/LiskMigrationIterator.php b/src/infrastructure/storage/lisk/LiskMigrationIterator.php
index a46512f866..edd31c8123 100644
--- a/src/infrastructure/storage/lisk/LiskMigrationIterator.php
+++ b/src/infrastructure/storage/lisk/LiskMigrationIterator.php
@@ -17,11 +17,9 @@ final class LiskMigrationIterator extends PhutilBufferedIterator {
 
   private $object;
   private $cursor;
-  private $set;
 
   public function __construct(LiskDAO $object) {
-    $this->set = new LiskDAOSet();
-    $this->object = $object->putInSet($this->set);
+    $this->object = $object;
   }
 
   protected function didRewind() {
@@ -33,15 +31,15 @@ final class LiskMigrationIterator extends PhutilBufferedIterator {
   }
 
   protected function loadPage() {
-    $this->set->clearSet();
-
     $results = $this->object->loadAllWhere(
       'id > %d ORDER BY id ASC LIMIT %d',
       $this->cursor,
       $this->getPageSize());
+
     if ($results) {
       $this->cursor = last($results)->getID();
     }
+
     return $results;
   }