diff -r 68b75c091028 -r 55b13f583356 tests/test_kv_list.c
--- a/tests/test_kv_list.c	Sun Dec 14 16:21:09 2025 +0100
+++ b/tests/test_kv_list.c	Sun Dec 14 17:30:17 2025 +0100
@@ -44,7 +44,7 @@
 }
 
 CX_TEST(test_kv_list_map_as_list) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
         CX_TEST_ASSERT(map != NULL);
@@ -58,7 +58,7 @@
     CxTestingAllocator talloc;
     cx_testing_allocator_init(&talloc);
     CX_TEST_DO {
-        CxList *list = cxKvListCreate(&talloc.base, NULL, 1);
+        CxList *list = cxKvListCreate(&talloc.base, 1);
         cxListAddArray(list, "test", 4);
         CxMap *map = cxKvListAsMap(list);
         cxMapFree(map);
@@ -71,7 +71,7 @@
     CxTestingAllocator talloc;
     cx_testing_allocator_init(&talloc);
     CX_TEST_DO {
-        CxMap *map = cxKvListCreateAsMap(&talloc.base, NULL, sizeof(int));
+        CxMap *map = cxKvListCreateAsMap(&talloc.base, sizeof(int));
         int x = 5;
         cxMapPut(map, "test", &x);
         CxList *list = cxKvListAsList(map);
@@ -82,7 +82,7 @@
 }
 
 CX_TEST(test_kv_list_remove) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -121,8 +121,8 @@
 }
 
 CX_TEST(test_kv_list_find_and_remove) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
-    cxCollectionCompareFunc(list, cx_cmp_int);
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
+    cxSetCompareFunc(list, cx_cmp_int);
     int x, y;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -174,7 +174,7 @@
 }
 
 CX_TEST(test_kv_list_remove_and_get) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x, y;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -216,7 +216,7 @@
 }
 
 CX_TEST(test_kv_list_remove_array) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -247,7 +247,7 @@
 }
 
 CX_TEST(test_kv_list_remove_array_and_get) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -282,7 +282,7 @@
 }
 
 CX_TEST(test_kv_list_map_put) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -305,7 +305,7 @@
 }
 
 CX_TEST(test_kv_list_map_put_ptr) {
-    CxList *list = cxKvListCreateSimple(CX_STORE_POINTERS);
+    CxList *list = cxKvListCreate(NULL, CX_STORE_POINTERS);
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -319,7 +319,7 @@
 }
 
 CX_TEST(test_kv_list_map_put_not_hashed) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -340,14 +340,14 @@
 }
 
 CX_TEST(test_kv_list_map_put_overwrite) {
-    CxList *list = cxKvListCreateSimple(CX_STORE_POINTERS);
+    CxList *list = cxKvListCreate(NULL, CX_STORE_POINTERS);
     CxTestingAllocator talloc;
     cx_testing_allocator_init(&talloc);
     CxAllocator *al = &talloc.base;
     int *x, *y;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
-        cxDefineAdvancedDestructor(map, cxFree, al);
+        cxSetAdvancedDestructor(map, cxFree, al);
         x = cxMalloc(al, sizeof(int));
         y = cxMalloc(al, sizeof(int));
         *x = 13;
@@ -370,7 +370,7 @@
 }
 
 CX_TEST(test_kv_list_map_remove) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -397,7 +397,7 @@
 }
 
 CX_TEST(test_kv_list_map_remove_and_get) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x, y;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -409,7 +409,7 @@
         CX_TEST_ASSERT(0 == cxMapPut(map, "abc", &x));
 
         CX_TEST_ASSERT(cxMapSize(map) == 2);
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         y = 0;
         CX_TEST_ASSERT(0 == cxMapRemoveAndGet(map, "xyz", &y));
@@ -429,7 +429,7 @@
 }
 
 CX_TEST(test_kv_list_set_key) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 47;
@@ -471,7 +471,7 @@
 }
 
 CX_TEST(test_kv_list_set_key_already_exists) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 47;
@@ -504,7 +504,7 @@
 }
 
 CX_TEST(test_kv_list_set_key_again) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 47;
@@ -531,7 +531,7 @@
 }
 
 CX_TEST(test_kv_list_remove_key) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -573,7 +573,7 @@
 }
 
 CX_TEST(test_kv_list_get_key) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         CxMap *map = cxKvListAsMap(list);
@@ -607,7 +607,7 @@
 }
 
 CX_TEST(test_kv_list_insert_with_key) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 47;
@@ -632,7 +632,7 @@
 }
 
 CX_TEST(test_kv_list_insert_ptr_with_key) {
-    CxList *list = cxKvListCreateSimple(CX_STORE_POINTERS);
+    CxList *list = cxKvListCreate(NULL, CX_STORE_POINTERS);
     int x, y, z;
     CX_TEST_DO {
         x = 15;
@@ -660,7 +660,7 @@
 }
 
 CX_TEST(test_kv_list_insert_array_and_set_keys) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     CX_TEST_DO {
         int arr[] = { 13, 21, 34, 55, 89 };
         CX_TEST_ASSERT(5 == cxListAddArray(list, arr, 5));
@@ -683,14 +683,14 @@
 }
 
 CX_TEST(test_kv_list_list_remove_destr_in_list) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
 
-        cxDefineDestructor(list, kv_list_test_destr);
+        cxSetDestructor(list, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         CX_TEST_ASSERT(0 == cxListRemove(list, 0));
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -699,14 +699,14 @@
 }
 
 CX_TEST(test_kv_list_list_remove_destr_in_map) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
         CxMap *map = cxKvListAsMap(list);
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         CX_TEST_ASSERT(0 == cxListRemove(list, 0));
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -715,13 +715,13 @@
 }
 
 CX_TEST(test_kv_list_map_remove_destr_in_list) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
         CxList *list = cxKvListAsList(map);
-        cxDefineDestructor(list, kv_list_test_destr);
+        cxSetDestructor(list, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         CX_TEST_ASSERT(0 == cxMapRemove(map, "xyz"));
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -730,13 +730,13 @@
 }
 
 CX_TEST(test_kv_list_map_remove_destr_in_map) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
 
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         CX_TEST_ASSERT(0 == cxMapRemove(map, "xyz"));
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -745,14 +745,14 @@
 }
 
 CX_TEST(test_kv_list_list_remove_destr2_in_list) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
 
-        cxDefineAdvancedDestructor(list, kv_list_test_destr2, (void*)0xef47);
+        cxSetAdvancedDestructor(list, kv_list_test_destr2, (void*)0xef47);
         kv_list_test_destr2_val = 0;
         kv_list_test_destr2_extra = NULL;
         CX_TEST_ASSERT(0 == cxListRemove(list, 0));
@@ -763,14 +763,14 @@
 }
 
 CX_TEST(test_kv_list_list_remove_destr2_in_map) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
         CxMap *map = cxKvListAsMap(list);
-        cxDefineAdvancedDestructor(map, kv_list_test_destr2, (void*)0xef47);
+        cxSetAdvancedDestructor(map, kv_list_test_destr2, (void*)0xef47);
         kv_list_test_destr2_val = 0;
         kv_list_test_destr2_extra = NULL;
         CX_TEST_ASSERT(0 == cxListRemove(list, 0));
@@ -781,13 +781,13 @@
 }
 
 CX_TEST(test_kv_list_map_remove_destr2_in_list) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
         CxList *list = cxKvListAsList(map);
-        cxDefineAdvancedDestructor(list, kv_list_test_destr2, (void*)0xef47);
+        cxSetAdvancedDestructor(list, kv_list_test_destr2, (void*)0xef47);
         kv_list_test_destr2_val = 0;
         kv_list_test_destr2_extra = NULL;
         CX_TEST_ASSERT(0 == cxMapRemove(map, "xyz"));
@@ -798,13 +798,13 @@
 }
 
 CX_TEST(test_kv_list_map_remove_destr2_in_map) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
 
-        cxDefineAdvancedDestructor(map, kv_list_test_destr2, (void*)0xef47);
+        cxSetAdvancedDestructor(map, kv_list_test_destr2, (void*)0xef47);
         kv_list_test_destr2_val = 0;
         kv_list_test_destr2_extra = NULL;
         CX_TEST_ASSERT(0 == cxMapRemove(map, "xyz"));
@@ -815,14 +815,14 @@
 }
 
 CX_TEST(test_kv_list_list_clear_destr_in_list) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
 
-        cxDefineDestructor(list, kv_list_test_destr);
+        cxSetDestructor(list, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         cxListClear(list);
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -831,14 +831,14 @@
 }
 
 CX_TEST(test_kv_list_list_clear_destr_in_map) {
-    CxList *list = cxKvListCreateSimple(sizeof(int));
+    CxList *list = cxKvListCreate(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxListAdd(list, &x));
         cxKvListSetKey(list, 0, "xyz");
         CxMap *map = cxKvListAsMap(list);
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         cxListClear(list);
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -847,13 +847,13 @@
 }
 
 CX_TEST(test_kv_list_map_clear_destr_in_list) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
         CxList *list = cxKvListAsList(map);
-        cxDefineDestructor(list, kv_list_test_destr);
+        cxSetDestructor(list, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         cxMapClear(map);
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -862,13 +862,13 @@
 }
 
 CX_TEST(test_kv_list_map_clear_destr_in_map) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     int x;
     CX_TEST_DO {
         x = 0xabcd;
         CX_TEST_ASSERT(0 == cxMapPut(map, "xyz", &x));
 
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         kv_list_test_destr_val = 0;
         cxMapClear(map);
         CX_TEST_ASSERT(kv_list_test_destr_val == 0xabcd);
@@ -877,8 +877,8 @@
 }
 
 CX_TEST(test_kv_list_destr_ptr) {
-    CxMap *map = cxKvListCreateAsMapSimple(CX_STORE_POINTERS);
-    cxDefineDestructor(map, kv_list_test_destr);
+    CxMap *map = cxKvListCreateAsMap(NULL, CX_STORE_POINTERS);
+    cxSetDestructor(map, kv_list_test_destr);
     int x;
     CX_TEST_DO {
         x = 0xabcd;
@@ -892,7 +892,7 @@
 }
 
 CX_TEST(test_kv_list_map_iterator) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     CX_TEST_DO {
         int x;
         x = 0xc0ffee; // this element shall be skipped
@@ -953,7 +953,7 @@
 }
 
 CX_TEST(test_kv_list_map_iterator_no_keys) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     CX_TEST_DO {
         CxList *list = cxKvListAsList(map);
         int x;
@@ -974,10 +974,10 @@
 }
 
 CX_TEST(test_kv_list_map_iterator_remove) {
-    CxMap *map = cxKvListCreateAsMapSimple(CX_STORE_POINTERS);
+    CxMap *map = cxKvListCreateAsMap(NULL, CX_STORE_POINTERS);
     int x, y, z;
     CX_TEST_DO {
-        cxDefineDestructor(map, kv_list_test_destr);
+        cxSetDestructor(map, kv_list_test_destr);
         x = 815;
         cxMapPut(map, "xyz", &x);
         y = 8016;
@@ -1005,9 +1005,9 @@
 }
 
 CX_TEST(test_kv_list_list_iterator_remove) {
-    CxMap *map = cxKvListCreateAsMapSimple(sizeof(int));
+    CxMap *map = cxKvListCreateAsMap(NULL, sizeof(int));
     CX_TEST_DO {
-        cxDefineAdvancedDestructor(map, kv_list_test_destr2, (void*)0xf00);
+        cxSetAdvancedDestructor(map, kv_list_test_destr2, (void*)0xf00);
         int x;
         x = 815;
         cxMapPut(map, "xyz", &x);