Revert "Revert "remove structure to apply bookends to selections""

This reverts commit b0cfa47c1f286391b7d216d4f34d2d227a5d26e0.

The core problem referenced in b0cfa47 has been resolved. We can re-apply
5d98b03 to remove the code creating 'bookends' when building prospective
selections.