Fix comodification exception unloading worlds, patch cleanup.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>