Uri and UriBuilder improvements.