BUG-8043: eliminate ConstraintFactory