Some quick cleanup of Url.