More changes to ViewController drag-and-drop logic.