Radical simplifications due to new splay tree.