Cosmetic changes to RouteConstraintMatcher.