diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -67,19 +67,13 @@
       $is_builtin = isset($builtins[$key]);
       $is_persistent = (bool)$property->getID();
 
-      $delete_uri = id(new PhutilURI($delete_base))
-        ->setQueryParams(
-          array(
-            'key' => $key,
-            'objectPHID' => $object->getPHID(),
-          ));
+      $params = array(
+        'key' => $key,
+        'objectPHID' => $object->getPHID(),
+      );
 
-      $edit_uri = id(new PhutilURI($edit_base))
-        ->setQueryParams(
-          array(
-            'key' => $key,
-            'objectPHID' => $object->getPHID(),
-          ));
+      $delete_uri = new PhutilURI($delete_base, $params);
+      $edit_uri = new PhutilURI($edit_base, $params);
 
       $delete = javelin_tag(
         'a',
diff --git a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
--- a/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthOneTimeLoginController.php
@@ -204,11 +204,11 @@
 
       $request->setTemporaryCookie(PhabricatorCookies::COOKIE_HISEC, 'yes');
 
-      return (string)id(new PhutilURI($panel_uri))
-        ->setQueryParams(
-          array(
-            'key' => $key,
-          ));
+      $params = array(
+        'key' => $key,
+      );
+
+      return (string)new PhutilURI($panel_uri, $params);
     }
 
     $providers = id(new PhabricatorAuthProviderConfigQuery())
diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
--- a/src/applications/diffusion/view/DiffusionView.php
+++ b/src/applications/diffusion/view/DiffusionView.php
@@ -81,12 +81,12 @@
     }
 
     if (isset($details['external'])) {
-      $href = id(new PhutilURI('/diffusion/external/'))
-        ->setQueryParams(
-          array(
-            'uri' => idx($details, 'external'),
-            'id'  => idx($details, 'hash'),
-          ));
+      $params = array(
+        'uri' => idx($details, 'external'),
+        'id'  => idx($details, 'hash'),
+      );
+
+      $href = new PhutilURI('/diffusion/external/', $params);
       $tip = pht('Browse External');
     } else {
       $href = $this->getDiffusionRequest()->generateURI(
diff --git a/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php b/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
--- a/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
+++ b/src/applications/diviner/markup/DivinerSymbolRemarkupRule.php
@@ -111,15 +111,15 @@
         // Here, we're generating comment text or something like that. Just
         // link to Diviner and let it sort things out.
 
-        $href = id(new PhutilURI('/diviner/find/'))
-          ->setQueryParams(
-            array(
-              'book' => $ref->getBook(),
-              'name' => $ref->getName(),
-              'type' => $ref->getType(),
-              'context' => $ref->getContext(),
-              'jump' => true,
-            ));
+        $params = array(
+          'book' => $ref->getBook(),
+          'name' => $ref->getName(),
+          'type' => $ref->getType(),
+          'context' => $ref->getContext(),
+          'jump' => true,
+        );
+
+        $href = new PhutilURI('/diviner/find/', $params);
       }
 
       // TODO: This probably is not the best place to do this. Move it somewhere
diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php
--- a/src/applications/herald/controller/HeraldNewController.php
+++ b/src/applications/herald/controller/HeraldNewController.php
@@ -81,13 +81,13 @@
         }
 
         if (!$errors && $done) {
-          $uri = id(new PhutilURI('edit/'))
-            ->setQueryParams(
-              array(
-                'content_type' => $content_type,
-                'rule_type' => $rule_type,
-                'targetPHID' => $target_phid,
-              ));
+          $params = array(
+            'content_type' => $content_type,
+            'rule_type' => $rule_type,
+            'targetPHID' => $target_phid,
+          );
+
+          $uri = new PhutilURI('edit/', $params);
           $uri = $this->getApplicationURI($uri);
           return id(new AphrontRedirectResponse())->setURI($uri);
         }
@@ -126,13 +126,13 @@
           ->addHiddenInput('step', 2)
           ->appendChild($rule_types);
 
+        $params = array(
+          'content_type' => $content_type,
+          'step' => '0',
+        );
+
         $cancel_text = pht('Back');
-        $cancel_uri = id(new PhutilURI('new/'))
-          ->setQueryParams(
-            array(
-              'content_type' => $content_type,
-              'step' => 0,
-            ));
+        $cancel_uri = new PhutilURI('new/', $params);
         $cancel_uri = $this->getApplicationURI($cancel_uri);
         $title = pht('Create Herald Rule: %s',
           idx($content_type_map, $content_type));
@@ -173,14 +173,14 @@
               ->setValue($request->getStr('objectName'))
               ->setLabel(pht('Object')));
 
+        $params = array(
+          'content_type' => $content_type,
+          'rule_type' => $rule_type,
+          'step' => 1,
+        );
+
         $cancel_text = pht('Back');
-        $cancel_uri = id(new PhutilURI('new/'))
-          ->setQueryParams(
-            array(
-              'content_type' => $content_type,
-              'rule_type' => $rule_type,
-              'step' => 1,
-            ));
+        $cancel_uri = new PhutilURI('new/', $params);
         $cancel_uri = $this->getApplicationURI($cancel_uri);
         $title = pht('Create Herald Rule: %s',
           idx($content_type_map, $content_type));
diff --git a/src/applications/owners/controller/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
--- a/src/applications/owners/controller/PhabricatorOwnersDetailController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
@@ -65,11 +65,11 @@
 
     $commit_views = array();
 
-    $commit_uri = id(new PhutilURI('/diffusion/commit/'))
-      ->setQueryParams(
-        array(
-          'package' => $package->getPHID(),
-        ));
+    $params = array(
+      'package' => $package->getPHID(),
+    );
+
+    $commit_uri = new PhutilURI('/diffusion/commit/', $params);
 
     $status_concern = DiffusionCommitAuditStatus::CONCERN_RAISED;
 
diff --git a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
--- a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
+++ b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
@@ -134,13 +134,13 @@
 
     $account_id = $account->getID();
 
+    $params = array(
+      'merchantID' => $merchant->getID(),
+      'cartID' => $cart->getID(),
+    );
+
     $payment_method_uri = $this->getApplicationURI("{$account_id}/card/new/");
-    $payment_method_uri = new PhutilURI($payment_method_uri);
-    $payment_method_uri->setQueryParams(
-      array(
-        'merchantID' => $merchant->getID(),
-        'cartID' => $cart->getID(),
-      ));
+    $payment_method_uri = new PhutilURI($payment_method_uri, $params);
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
diff --git a/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php b/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
--- a/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePayPalPaymentProvider.php
@@ -348,12 +348,14 @@
           ->setRawPayPalQuery('SetExpressCheckout', $params)
           ->resolve();
 
-        $uri = new PhutilURI('https://www.sandbox.paypal.com/cgi-bin/webscr');
-        $uri->setQueryParams(
-          array(
-            'cmd'   => '_express-checkout',
-            'token' => $result['TOKEN'],
-          ));
+        $params = array(
+          'cmd'   => '_express-checkout',
+          'token' => $result['TOKEN'],
+        );
+
+        $uri = new PhutilURI(
+          'https://www.sandbox.paypal.com/cgi-bin/webscr',
+          $params);
 
         $cart->setMetadataValue('provider.checkoutURI', (string)$uri);
         $cart->save();
diff --git a/src/applications/phortune/provider/PhortunePaymentProvider.php b/src/applications/phortune/provider/PhortunePaymentProvider.php
--- a/src/applications/phortune/provider/PhortunePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePaymentProvider.php
@@ -273,8 +273,7 @@
     $app = PhabricatorApplication::getByClass('PhabricatorPhortuneApplication');
     $path = $app->getBaseURI().'provider/'.$id.'/'.$action.'/';
 
-    $uri = new PhutilURI($path);
-    $uri->setQueryParams($params);
+    $uri = new PhutilURI($path, $params);
 
     if ($local) {
       return $uri;
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -820,8 +820,6 @@
       return $uri;
     }
 
-    $uri = new PhutilURI($uri);
-
     if (isset($params['lint'])) {
       $params['params'] = idx($params, 'params', array()) + array(
         'lint' => $params['lint'],
@@ -830,11 +828,7 @@
 
     $query = idx($params, 'params', array()) + $query;
 
-    if ($query) {
-      $uri->setQueryParams($query);
-    }
-
-    return $uri;
+    return new PhutilURI($uri, $query);
   }
 
   public function updateURIIndex() {