Uniquify, part 2

Once #1 is merged, this will only be the changes to actually use the uniquified value. Ignore until then.