Some cleanup in UriInfo class.