Polish the fix from the last commit and straighten some other multiworld issues in the move handler.