Fix ConstraintExpression clean()