Restore uniqueness note, minor formatting fixup