Cleanup, fix some cases where logging does not log the world.Signed-off-by: Ross Allan <[email protected]> (commit: 031aae3)