Refactor ZipRosterConstraintValidator