I've now heard from several people. Make sure the surviving spouse is made to be the *primary* tax payer, and the decedent is the secondary (or "spouse"). Seems to have worked for everyone who has made the switch
