Part 1 of inventory refactoring for Nightly: Make TankInventory
non-static.