Minor modifications to URL regexps.