Yeah, when I saw this change and the amount of code in `addDropTaget`, I thought along the same lines.  But in the interest of getting the code-base sync'd, I postponed making that change