Refactor of dwarfmove logic.