tundra.uri:parse - fix parsing of opaque URIs that include variable
substitution in the query string to work correctly