@dmertz
According to Pub 590B a return of excess from a Roth IRA also involves Form 8606 (basis in Roth).
If I do it your way code J and box 2a with other tax software
I get a taxable distribution on Form 8606 line 21
which I can eliminate by entering my earlier contribution to my Roth IRA line 22.
This clears out Form 5329.
