More work on keywork drag/drop.