Simplifying away the two different ways of refering to endpoints.