Added a URI parser that should be standards conformant. (It can certainly