Fix ConstraintDefinition inconsistency