Further simplification of URI class.