Continued refactoring...

See previous commit
Dropped silly private static stuff
Moved various common inventory methods to InventoryHelper (meant to do
this much, much sooner)