Thank you dmertz.
I also spoke with a TurboTax CPA. And they said, it's not a problem as the IRS has the 1099-R and will figure out that its a rollover.
I'd rather not bet that the IRS will figure out the discretion properly though. Personally speaking...
