Thank you for confirming my suspicion and at the same time giving me the relief to know that the expense will count.
Now I just have to do the math of current + pending + what I paid for the upgrade + rollover conversion and see how much I have to run for. If I overshoot a bit, it's no big deal, I can still tune down the MQD part of my rollover conversion if needed.
I checked the receipts for the upgrades, and they say that the amount for taxes and fees is $0 (not sure if that's always the case or if there would be some taxes if I were located in the US). Only the flight receipt itself has a bunch of taxes and fees listed - but the MQD for the flight are already in the "pending" part of the graph, so I know what to expect.