ADDED: Rewrote RFC 3987 grammar.