Yes. My post gives a somewhat muddled explanation of what I think the right way is. The key idea is that I treat "waking up in one of the possible worlds" as a new piece of information that tells you that the possibilities are now mutually exclusive, but doesn't tell you anything else.
If it's worth saying, but not worth its own post, even in Discussion, it goes here.