Add additional checking to ensure that no more than one id set is added as a constraint, as this leads to the best performance on mysql 5.5. Also, consolidate logic for checking against multiple id sets in an evaluation context.
Update to reflect new API