Use consistent parsing of URLs

The change we talked about. (:

I was able to remove the leading slash check since that's taken care of by the parser.