fix for AVL trees
take/drop in terms of split-at; cleaning up some related clutter
Merge branch 'master' into ungrammar