[Bug 8625] Separate tavl and avl types