I think you are right. A part of the instructions for Form 1099-R that I missed says to use code 7 for reporting military pensions or survivor benefit annuities. So it seems that code 2 is never to be used for these. (I had thought that these fell under the last bullet item of listed for code 2, but apparently not).
