Guess I should have gone back and reread the episodes more carefully. I have been away for a bit, but I had some of this typed up already so I thought I would try to close out at least one DeMorrell branch before working on the others.
Too bad none of it works. :P
I can think of a way to post a workable re-written version that just adds in one extra wish and leaves pretty much everything else the same. I still might do that, but your corrected branch has also given me some fun ideas, though it might take a few days before I have anything worth posting.