Minor RTree cleanup and adding experimental id support for entries.