I would expect a second 1099-R for the Roth conversion.  Follow the money through statements if you need to.  I've found that, in this area, often what clients think happened and what really happened are two different things.  Find out what really happened, then figure out the tax implications.