Update to new avl/list iteration macros