Better handle some oddly-named URLs.