rb_tree: reorganize code in rb_erase() for additional changes