Prevent endpoints from duplicating

Fixes confirmed bug from issue #552. However, there are breaking changes to the spec.