Parsing: Further improvements to uri parser.

Don't treat punctuation before percent-encoding as final punctuation.
Don't treat '+' as final punctuation.