Thanks dmertz, that seems to work. I guess I had failed to include the excess contribution in (b) before, so it was never prompting me to include any amount returned before the tax due date. Once I listed the full $12K it said I had a penalty, and allowed me to note the returned contribution.
