diff -r d4baf4dd55c3 -r fe0d69d72bcd src/tree.c
--- a/src/tree.c	Thu May 23 19:29:14 2024 +0200
+++ b/src/tree.c	Thu May 23 20:29:28 2024 +0200
@@ -280,12 +280,12 @@
     iter.skip = false;
 
     // assign base iterator functions
-    iter.mutating = false;
-    iter.remove = false;
-    iter.current_impl = NULL;
-    iter.valid = cx_tree_iter_valid;
-    iter.next = cx_tree_iter_next;
-    iter.current = cx_tree_iter_current;
+    iter.base.mutating = false;
+    iter.base.remove = false;
+    iter.base.current_impl = NULL;
+    iter.base.valid = cx_tree_iter_valid;
+    iter.base.next = cx_tree_iter_next;
+    iter.base.current = cx_tree_iter_current;
 
     return iter;
 }
@@ -389,12 +389,12 @@
     iter.queue_last = NULL;
 
     // assign base iterator functions
-    iter.mutating = false;
-    iter.remove = false;
-    iter.current_impl = NULL;
-    iter.valid = cx_tree_visitor_valid;
-    iter.next = cx_tree_visitor_next;
-    iter.current = cx_tree_visitor_current;
+    iter.base.mutating = false;
+    iter.base.remove = false;
+    iter.base.current_impl = NULL;
+    iter.base.valid = cx_tree_visitor_valid;
+    iter.base.next = cx_tree_visitor_next;
+    iter.base.current = cx_tree_visitor_current;
 
     return iter;
 }