More drag/drop refactoring.