Yea, I'm fine with waiting until #433 is resolved and then rebasing this. It would be nice to see the ID generation centralized, it took me awhile to realize what was happening with the children.