Command block fixes 2
Merge remote-tracking branch 'xdot/master'

* xdot/master:
  Command block fixes 2
Minor style improvements for the merged PR.
Improved code safety for the Compact world storage.

That was a huge chunk of smelly code.