GeorgeM and JulieS - I am now convinced that you both were correct. Enter the accrued market discount and do not check anything on the next page. The accrued market discount is then treated as ordinary interest and is also added to the basis, thus only taxed as ordinary interest. The D code is present on column 1f of form 8949.
Thank you for your replies and patience.
