Rework and cleanup constraint relationships objects.