That did take care of it--thank you. Now my HSA (8889) form is filled out correctly. I let TurboTax "walk me through everything" but somehow it didn't bring me ...

The Distribution Code is 2. The 1099 shows that I withdrew the excess contribution, and that there were no earnings on it.