Modify to generic AVL.