diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 90d1feed2d4..841ba94dd1c 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -192,7 +192,7 @@ pub fn main_fetch(request: Rc<Request>,
             .read()
             .unwrap()
             .is_host_secure(request.current_url().domain().unwrap()) {
-           request.url_list.borrow_mut().last_mut().unwrap().as_mut_url().unwrap().set_scheme("https").unwrap();
+           request.url_list.borrow_mut().last_mut().unwrap().as_mut_url().set_scheme("https").unwrap();
         }
     }
 
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 9a23ff0e4d7..8f3c9a36d10 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -129,7 +129,7 @@ impl NetworkHttpRequestFactory {
     fn create(&self, url: ServoUrl, method: Method, headers: Headers)
               -> Result<HyperRequest<Fresh>, NetworkError> {
         let connection = HyperRequest::with_connector(method,
-                                                      url.clone().into_url().unwrap(),
+                                                      url.clone().into_url(),
                                                       &*self.connector);
 
         if let Err(HttpError::Ssl(ref error)) = connection {
@@ -222,7 +222,7 @@ fn strict_origin_when_cross_origin(referrer_url: ServoUrl, url: ServoUrl) -> Opt
 fn strip_url(mut referrer_url: ServoUrl, origin_only: bool) -> Option<ServoUrl> {
     if referrer_url.scheme() == "https" || referrer_url.scheme() == "http" {
         {
-            let referrer = referrer_url.as_mut_url().unwrap();
+            let referrer = referrer_url.as_mut_url();
             referrer.set_username("").unwrap();
             referrer.set_password(None).unwrap();
             referrer.set_fragment(None);
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index b958e8f1225..afcfd9c6690 100755
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -384,12 +384,12 @@ impl HTMLFormElement {
     fn mutate_action_url(&self, form_data: &mut Vec<FormDatum>, mut load_data: LoadData, encoding: EncodingRef) {
         let charset = &*encoding.whatwg_name().unwrap();
 
-        if let Some(ref mut url) = load_data.url.as_mut_url() {
-            url.query_pairs_mut().clear()
-               .encoding_override(Some(self.pick_encoding()))
-               .extend_pairs(form_data.into_iter()
-                                      .map(|field| (field.name.clone(), field.replace_value(charset))));
-        }
+        load_data.url
+            .as_mut_url()
+            .query_pairs_mut().clear()
+            .encoding_override(Some(self.pick_encoding()))
+            .extend_pairs(form_data.into_iter()
+                                    .map(|field| (field.name.clone(), field.replace_value(charset))));
 
         self.plan_to_navigate(load_data);
     }
@@ -403,13 +403,12 @@ impl HTMLFormElement {
                 let charset = &*encoding.whatwg_name().unwrap();
                 load_data.headers.set(ContentType::form_url_encoded());
 
-
-                if let Some(ref mut url) = load_data.url.as_mut_url() {
-                    url.query_pairs_mut().clear()
-                       .encoding_override(Some(self.pick_encoding()))
-                       .extend_pairs(form_data.into_iter()
-                       .map(|field| (field.name.clone(), field.replace_value(charset))));
-                }
+                load_data.url
+                    .as_mut_url()
+                    .query_pairs_mut().clear()
+                    .encoding_override(Some(self.pick_encoding()))
+                    .extend_pairs(form_data.into_iter()
+                    .map(|field| (field.name.clone(), field.replace_value(charset))));
 
                 load_data.url.query().unwrap_or("").to_string().into_bytes()
             }
diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs
index cf8a6201f8b..a02a735638f 100644
--- a/components/script/dom/url.rs
+++ b/components/script/dom/url.rs
@@ -52,9 +52,8 @@ impl URL {
     }
 
     pub fn set_query_pairs(&self, pairs: &[(String, String)]) {
-        if let Some(ref mut url) = self.url.borrow_mut().as_mut_url() {
-            url.query_pairs_mut().clear().extend_pairs(pairs);
-        }
+        let mut url = self.url.borrow_mut();
+        url.as_mut_url().query_pairs_mut().clear().extend_pairs(pairs);
     }
 }
 
diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs
index e001faf7a81..d00189156f0 100644
--- a/components/script/dom/urlhelper.rs
+++ b/components/script/dom/urlhelper.rs
@@ -45,49 +45,31 @@ impl UrlHelper {
         USVString(quirks::username(url.as_url()).to_owned())
     }
     pub fn SetHash(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            quirks::set_hash(url, &value.0)
-        }
+        quirks::set_hash(url.as_mut_url(), &value.0)
     }
     pub fn SetHost(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_host(url, &value.0);
-        }
+        let _ = quirks::set_host(url.as_mut_url(), &value.0);
     }
     pub fn SetPort(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_port(url, &value.0);
-        }
+        let _ = quirks::set_port(url.as_mut_url(), &value.0);
     }
     pub fn SetSearch(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            quirks::set_search(url, &value.0)
-        }
+        quirks::set_search(url.as_mut_url(), &value.0)
     }
     pub fn SetPathname(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            quirks::set_pathname(url, &value.0)
-        }
+        quirks::set_pathname(url.as_mut_url(), &value.0)
     }
     pub fn SetHostname(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_hostname(url, &value.0);
-        }
+        let _ = quirks::set_hostname(url.as_mut_url(), &value.0);
     }
     pub fn SetPassword(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_password(url, &value.0);
-        }
+        let _ = quirks::set_password(url.as_mut_url(), &value.0);
     }
     pub fn SetProtocol(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_protocol(url, &value.0);
-        }
+        let _ = quirks::set_protocol(url.as_mut_url(), &value.0);
     }
     pub fn SetUsername(url: &mut ServoUrl, value: USVString) {
-        if let Some(ref mut url) = url.as_mut_url() {
-            let _ = quirks::set_username(url, &value.0);
-        }
+        let _ = quirks::set_username(url.as_mut_url(), &value.0);
     }
     // https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy
     pub fn is_origin_trustworthy(url: &ServoUrl) -> bool {
diff --git a/components/url/lib.rs b/components/url/lib.rs
index 766c5bd5f5c..3ed02fae11d 100644
--- a/components/url/lib.rs
+++ b/components/url/lib.rs
@@ -47,10 +47,8 @@ impl ServoUrl {
         Arc::try_unwrap(self.0).unwrap_or_else(|s| (*s).clone()).into_string()
     }
 
-    // NOTE: These methods return options that are always true temporarily until
-    // we special-case some urls to avoid going through rust-url.
-    pub fn into_url(self) -> Option<Url> {
-        Some(Arc::try_unwrap(self.0).unwrap_or_else(|s| (*s).clone()))
+    pub fn into_url(self) -> Url {
+        Arc::try_unwrap(self.0).unwrap_or_else(|s| (*s).clone())
     }
 
     pub fn as_url(&self) -> &Url {
@@ -94,24 +92,24 @@ impl ServoUrl {
         self.0.as_str()
     }
 
-    pub fn as_mut_url(&mut self) -> Option<&mut Url> {
-        Some(Arc::make_mut(&mut self.0))
+    pub fn as_mut_url(&mut self) -> &mut Url {
+        Arc::make_mut(&mut self.0)
     }
 
     pub fn set_username(&mut self, user: &str) -> Result<(), ()> {
-        Arc::make_mut(&mut self.0).set_username(user)
+        self.as_mut_url().set_username(user)
     }
 
     pub fn set_ip_host(&mut self, addr: IpAddr) -> Result<(), ()> {
-        Arc::make_mut(&mut self.0).set_ip_host(addr)
+        self.as_mut_url().set_ip_host(addr)
     }
 
     pub fn set_password(&mut self, pass: Option<&str>) -> Result<(), ()> {
-        Arc::make_mut(&mut self.0).set_password(pass)
+        self.as_mut_url().set_password(pass)
     }
 
     pub fn set_fragment(&mut self, fragment: Option<&str>) {
-        Arc::make_mut(&mut self.0).set_fragment(fragment)
+        self.as_mut_url().set_fragment(fragment)
     }
 
     pub fn username(&self) -> &str {