Changing handling of `uri` within `utility.parse()`