tree.h cache-instrumented macros were invalidating NULL pointers in some cases