Continuing work on the new custom query mechanism for r-tree.