Yeah, in the end Customer Support had to manually issue a service code to remove the remaining charges.
Still think the situation is a bit shady, considering that Deluxe being free isn't explicitly mentioned on the Military Discount page, and that I had to spend 30 minutes on the phone to get someone to add it on manually.
If they still have this problem next year, I think I'll move on and find some other way to file.
