added rtree macros to make things consistent.