Improve design of edge constraints checking

[prmr]

The edge validation code requires the construction of an entirely new ConstraintSet object for every call, which is not efficient. We can refactor the code so that we only need one ConstraintSet per diagram type.