Slight refactoring to allow for extending RelationalServiceInfo when
using URIs that don't conform to the expectations of UriInfo.
Minor formatting fixes