diff -r d4baf4dd55c3 -r fe0d69d72bcd src/map.c
--- a/src/map.c	Thu May 23 19:29:14 2024 +0200
+++ b/src/map.c	Thu May 23 20:29:28 2024 +0200
@@ -52,7 +52,7 @@
 ) {
     CxIterator iter = {0};
     iter.src_handle.c = map;
-    iter.valid = cx_empty_map_iter_valid;
+    iter.base.valid = cx_empty_map_iter_valid;
     return iter;
 }
 
@@ -66,14 +66,16 @@
 };
 
 CxMap cx_empty_map = {
-        NULL,
-        NULL,
-        0,
-        0,
-        NULL,
-        NULL,
-        NULL,
-        false,
+        {
+                NULL,
+                NULL,
+                0,
+                0,
+                NULL,
+                NULL,
+                NULL,
+                false
+        },
         &cx_empty_map_class
 };
 
@@ -83,18 +85,18 @@
 
 CxIterator cxMapMutIteratorValues(CxMap *map) {
     CxIterator it = map->cl->iterator(map, CX_MAP_ITERATOR_VALUES);
-    it.mutating = true;
+    it.base.mutating = true;
     return it;
 }
 
 CxIterator cxMapMutIteratorKeys(CxMap *map) {
     CxIterator it = map->cl->iterator(map, CX_MAP_ITERATOR_KEYS);
-    it.mutating = true;
+    it.base.mutating = true;
     return it;
 }
 
 CxIterator cxMapMutIterator(CxMap *map) {
     CxIterator it = map->cl->iterator(map, CX_MAP_ITERATOR_PAIRS);
-    it.mutating = true;
+    it.base.mutating = true;
     return it;
 }