AVL: Change API

There is also a very minor edit caught in the middle