Update for upstream changes

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