Code Cleanup!

This cleanly merges with https://github.com/sk89q/worldedit/pull/296