Refactorings. Equipping and unequipping plane upgrades now persist correctly through sessions.