Even further simplification of the URI class.