Internal UID simplifications/nits.