Small cleanup of the UrlBuilder..