Fix #913 turn Move wizards into proper Refactorings