More tweaks to RBTree search.