Continuing clean-up of the R-Tree module in preparation for cutting in the
new generalized query mechanism.