More refactoring wizard.