Bug 1073547 - Add in-between divider dropping hints. r=kgrandon

This simplifies the group rearrangement logic and brings it closer to spec.