Added data markings to uniqueness constraint checks, followup to #22