Revision 19590 does that.
If we "visit" a choice, clear out lastItemUsed. For item usage that is handled in a choice, ChoiceManager will handle inventory.
I also made the Bastille Battalion control rig reusable, since it is, even though the above change should make that irrelevant.
I tested by using a pocket wish, getting another pony, and going to the Equipment tab of Inventory, with a different tab previously open.
Inventory was fine.