This is the kind of voodoo that I really wish wasn’t necessary this far into the “future”. If you think about it, it’s been twelve major iterations (even if iCloud came along in its present form about halfway through) and bits of the system (especially anything related to syncing, in whatever form) still seem to be tacked on to each other with duct tape and designed for optimistic scenarios.