Uniquify, part 1

Doesn't yet actually use this value, but putting this in place means we can get things moving the right direction.