Additional improvements to URL parsing.