Code cleanup, but mostly VoidUpgradable

I got the void upgradable *finalized*, so we should be cleared in hot to
add a bunch of awesome upgradable items and implement the necessary
changes to the existing ones. Now I can start working on new features!