Revised unique constraints.