Index: tests/list/dlist-insert-remove.cfa
===================================================================
--- tests/list/dlist-insert-remove.cfa	(revision 4c5ce70cefb1ca083ae70b36f9038493fc67b4e3)
+++ tests/list/dlist-insert-remove.cfa	(revision 81ab5ebb3b497e7c713dd340f479f3d7e803ea4a)
@@ -1436,5 +1436,5 @@
 // Section 4g
 //
-// Test cases of isEmpty, isFirst, isLast,
+// Test cases of empty, isFirst, isLast,
 // remove_first, remove_last, modifications via iter
 //
@@ -1449,9 +1449,9 @@
 	mary m3 = {3.7};
 
-	dlist(mary) ml;			assert( isEmpty( ml ));
-
-	insert_last(ml, m1);	assert(!isEmpty( ml ));
-	insert_last(ml, m2);	assert(!isEmpty( ml ));
-	insert_last(ml, m3);	assert(!isEmpty( ml ));
+	dlist(mary) ml;			assert(empty( ml ));
+
+	insert_last(ml, m1);	assert(!empty( ml ));
+	insert_last(ml, m2);	assert(!empty( ml ));
+	insert_last(ml, m3);	assert(!empty( ml ));
 
 	mary & m1prev = prev( m1 );
@@ -1494,5 +1494,5 @@
 	// queue, back to front
 
-	assert( isEmpty( ml ));
+	assert(empty( ml ));
 
 	insert_last(ml, m1);
@@ -1500,8 +1500,8 @@
 	insert_last(ml, m3);
 
-	&m1r = & remove_first(ml);	assert(!isEmpty( ml ));
-	&m2r = & remove_first(ml);	assert(!isEmpty( ml ));
-	&m3r = & remove_first(ml);	assert( isEmpty( ml ));
-	&mxr = & remove_first(ml);	assert( isEmpty( ml ));
+	&m1r = & remove_first(ml);	assert(!empty( ml ));
+	&m2r = & remove_first(ml);	assert(!empty( ml ));
+	&m3r = & remove_first(ml);	assert(empty( ml ));
+	&mxr = & remove_first(ml);	assert(empty( ml ));
 
 	assert( &m1r == &m1 );
@@ -1516,5 +1516,5 @@
 	// queue, front to back
 
-	assert( isEmpty( ml ));
+	assert(empty( ml ));
 
 	insert_first(ml, m1);
@@ -1522,8 +1522,8 @@
 	insert_first(ml, m3);
 
-	&m1r = & remove_last(ml);	assert(!isEmpty( ml ));
-	&m2r = & remove_last(ml);	assert(!isEmpty( ml ));
-	&m3r = & remove_last(ml);	assert( isEmpty( ml ));
-	&mxr = & remove_last(ml);	assert( isEmpty( ml ));
+	&m1r = & remove_last(ml);	assert(!empty( ml ));
+	&m2r = & remove_last(ml);	assert(!empty( ml ));
+	&m3r = & remove_last(ml);	assert(empty( ml ));
+	&mxr = & remove_last(ml);	assert(empty( ml ));
 
 	assert( &m1r == &m1 );
@@ -1538,5 +1538,5 @@
 	// stack at front
 
-	assert( isEmpty( ml ));
+	assert(empty( ml ));
 
 	insert_first(ml, m1);
@@ -1544,8 +1544,8 @@
 	insert_first(ml, m3);
 
-	&m3r = & remove_first(ml);	assert(!isEmpty( ml ));
-	&m2r = & remove_first(ml);	assert(!isEmpty( ml ));
-	&m1r = & remove_first(ml);	assert( isEmpty( ml ));
-	&mxr = & remove_first(ml);	assert( isEmpty( ml ));
+	&m3r = & remove_first(ml);	assert(!empty( ml ));
+	&m2r = & remove_first(ml);	assert(!empty( ml ));
+	&m1r = & remove_first(ml);	assert(empty( ml ));
+	&mxr = & remove_first(ml);	assert(empty( ml ));
 
 	assert( &m1r == &m1 );
@@ -1560,5 +1560,5 @@
 	// stack at back
 
-	assert( isEmpty( ml ));
+	assert(empty( ml ));
 
 	insert_last(ml, m1);
@@ -1566,8 +1566,8 @@
 	insert_last(ml, m3);
 
-	&m3r = & remove_last(ml);	assert(!isEmpty( ml ));
-	&m2r = & remove_last(ml);	assert(!isEmpty( ml ));
-	&m1r = & remove_last(ml);	assert( isEmpty( ml ));
-	&mxr = & remove_last(ml);	assert( isEmpty( ml ));
+	&m3r = & remove_last(ml);	assert(!empty( ml ));
+	&m2r = & remove_last(ml);	assert(!empty( ml ));
+	&m1r = & remove_last(ml);	assert(empty( ml ));
+	&mxr = & remove_last(ml);	assert(empty( ml ));
 
 	assert( &m1r == &m1 );
@@ -1593,5 +1593,5 @@
 
 	insert_before( iter( ml ), m1 );
-	assert( ! isEmpty( ml ) );
+	assert( !empty( ml ) );
 
 	mary & mlfirst = first( ml );