Revert unneeded changes introduced as a side-effect AuxPoW.

Revert unneeded changes introduced as a side-effect AuxPoW; most of these simply re-order code or change variable names, although a number of data items were not being loaded from disk post-change as well.