More work done on the rbtree stuff.