Index: doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c
===================================================================
--- doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -232,5 +232,5 @@
         for ( t = 0; t < Times; t += 1 ) {
                 Repeat( insert_last( lst, s[i] ) );
-                Repeat( remove( lst`first ) );
+                Repeat( remove( first( lst ) ) );
         }
         end = clock();
Index: doc/theses/mike_brooks_MMath/benchmarks/list/fx-cfa-cfa.h
===================================================================
--- doc/theses/mike_brooks_MMath/benchmarks/list/fx-cfa-cfa.h	(revision 10ef4753267823d6dcec6e823051514c6b11208b)
+++ doc/theses/mike_brooks_MMath/benchmarks/list/fx-cfa-cfa.h	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
@@ -11,11 +11,11 @@
 #define BFX_INSERT_BEFORE(S, lst, item, refIter) (insert_before(*refIter, item), (S*)&(item))
 #define BFX_INSERT_AFTER(S, lst, item, refIter)  (insert_after (*refIter, item), (S*)&(item))
-#define BFX_REMOVE_FIRST(S, lst)                 remove(lst`first)
-#define BFX_REMOVE_LAST(S, lst)                  remove(lst`last)
+#define BFX_REMOVE_FIRST(S, lst)                 remove( first( lst ) )
+#define BFX_REMOVE_LAST(S, lst)                  remove( last( lst ) )
 #define BFX_REMOVE_HERE(S, lst, refIter)         remove(*refIter)
 #define BFX_INIT(S, lst)
 
-#define BFX_GET_AFTER(S, lst, iter)              (&(*iter)`next)
-#define BFX_GET_BEFORE(S, lst, iter)             (&(*iter)`prev)
+#define BFX_GET_AFTER(S, lst, iter)              (&next( *iter))
+#define BFX_GET_BEFORE(S, lst, iter)             (&prev( *iter ))
 #define BFX_IS_VALID_POS(S, lst, iter)           ((iter)!=NULL)
 #define BFX_DEREF_POS(S, lst, iter)              (iter)