[NEW] Improved handling for groups of constraints.