Refactor part of dwarfmove to remove goto jumpout