Allow consumers to override the onDrop behavior.
Stop keeping a list of all available containers.
Tidy up utility code.