Eliminate RouteDistinguisherBuilder