Yes, the other details sure help. It turns out none of this would be subject to penalty and your client simply wants to defer some of the taxable amount. That's a different strategy than we thought you were asking.

I agree with Bob; enter it as separate reporting. The issuer didn't have to, because they don't care about your tax treatment. But if you need that result, you need to do it the way you get the result.