Clean up the UniqueID stuff, to avoid plumbing it everywhere
Address Ian's comments
Merge pull request #937 from twitter/uniqueid-clean

Clean up the UniqueID stuff, to avoid plumbing it everywhere