Rework and cleanup constraint relationships objects.
Merge github.com:mjwybrow/dunnart