First half of ID-dependence removal

Once this is completed, then we can do the secret sauce to make it
UUID-compatable.