Update for upstream changes

Note that `extra::url::Url` is unusable now since it is private. (mozilla/rust#9526)