General fix-up of drag-and-drop logic.
Fix missing self in restore method.