This was pretty much what I was planning to do, so I'm glad others see it the same way.

Of course, very little is easy about this right now, even domestically--I now attach a two-page explanation to my (and my husband's) federal tax returns every year (although I also expect to file amended tax returns shortly based on the recent decision issued in Gill v. Office of Personal Management just to toll the statute of limitations, even if the government elects to appeal this decision).