diff -r 8168e16cd1e9 -r 227c2eabbef8 src/linked_list.c
--- a/src/linked_list.c	Sun Oct 03 16:02:53 2021 +0200
+++ b/src/linked_list.c	Sun Oct 03 16:30:47 2021 +0200
@@ -45,25 +45,27 @@
     return cur;
 }
 
-void *cx_linked_list_last(void **begin, void **end, ptrdiff_t loc_next) {
-    if (end != NULL) {
-        return *end;
-    } else {
-        if (begin == NULL || *begin == NULL)
-            return NULL;
+void *cx_linked_list_last(void *begin, ptrdiff_t loc_next) {
+    if (begin == NULL)
+        return NULL;
 
-        void *cur = *begin;
-        void *last;
-        do {
-            last = cur;
-        } while ((cur = *CX_LL_PTR(cur, loc_next)) != NULL);
+    void *cur = begin;
+    void *last;
+    do {
+        last = cur;
+    } while ((cur = *CX_LL_PTR(cur, loc_next)) != NULL);
 
-        return last;
-    }
+    return last;
 }
 
 void cx_linked_list_add(void **begin, void **end, ptrdiff_t loc_prev, ptrdiff_t loc_next, void *new_node) {
-    void *last = cx_linked_list_last(begin, end, loc_next);
+    void *last;
+    if (end == NULL) {
+        assert(begin != NULL);
+        last = cx_linked_list_last(*begin, loc_next);
+    } else {
+        last = *end;
+    }
     if (last == NULL) {
         assert(begin != NULL);
         *begin = new_node;
@@ -75,7 +77,7 @@
 
     // if there is an end pointer, update it
     if (end != NULL) {
-        *end = cx_linked_list_last(&new_node, NULL, loc_next);
+        *end = cx_linked_list_last(new_node, loc_next);
     }
 
     // if the nodes use a prev pointer, update it
@@ -224,8 +226,8 @@
 
 static void *cx_ll_last(cx_list_s *list) {
     cx_linked_list *ll = (cx_linked_list *) list;
-    cx_linked_list_node *last = cx_linked_list_last(NULL, (void **) &ll->end, CX_LL_LOC_NEXT);
-    return &last->payload;
+    cx_linked_list_node *last = ll->end;
+    return last == NULL ? NULL : &last->payload;
 }
 
 static cx_list_class cx_linked_list_class = {