@@ -28,11 +28,11 @@
 - (void)listTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFList *list;
 	OFEnumerator *enumerator;
-	OFListItem *iter;
+	OFListItem iter;
 	OFString *obj;
 	size_t i;
 	bool ok;
 
 	TEST(@"+[list]", (list = [OFList list]))
@@ -39,35 +39,38 @@
 
 	TEST(@"-[appendObject:]", [list appendObject: strings[0]] &&
 	    [list appendObject: strings[1]] && [list appendObject: strings[2]])
 
 	TEST(@"-[firstListItem]",
-	    [list.firstListItem->object isEqual: strings[0]])
+	    [OFListItemObject(list.firstListItem) isEqual: strings[0]])
 
-	TEST(@"-[firstListItem]->next",
-	    [list.firstListItem->next->object isEqual: strings[1]])
+	TEST(@"OFListItemNext()",
+	    [OFListItemObject(OFListItemNext(list.firstListItem))
+	    isEqual: strings[1]])
 
 	TEST(@"-[lastListItem]",
-	    [list.lastListItem->object isEqual: strings[2]])
+	    [OFListItemObject(list.lastListItem) isEqual: strings[2]])
 
-	TEST(@"-[lastListItem]->previous",
-	    [list.lastListItem->previous->object isEqual: strings[1]])
+	TEST(@"OFListItemPrevious()",
+	    [OFListItemObject(OFListItemPrevious(list.lastListItem))
+	    isEqual: strings[1]])
 
 	TEST(@"-[removeListItem:]",
 	    R([list removeListItem: list.lastListItem]) &&
-	    [list.lastListItem->object isEqual: strings[1]] &&
+	    [list.lastObject isEqual: strings[1]] &&
 	    R([list removeListItem: list.firstListItem]) &&
-	    [list.firstListItem->object isEqual: list.lastListItem->object])
+	    [list.firstObject isEqual: list.lastObject])
 
 	TEST(@"-[insertObject:beforeListItem:]",
 	    [list insertObject: strings[0] beforeListItem: list.lastListItem] &&
-	    [list.lastListItem->previous->object isEqual: strings[0]])
+	    [OFListItemObject(OFListItemPrevious(list.lastListItem))
+	    isEqual: strings[0]])
 
 	TEST(@"-[insertObject:afterListItem:]",
 	    [list insertObject: strings[2]
-		 afterListItem: list.firstListItem->next] &&
-	    [list.lastListItem->object isEqual: strings[2]])
+		 afterListItem: OFListItemNext(list.firstListItem)] &&
+	    [list.lastObject isEqual: strings[2]])
 
 	TEST(@"-[count]", list.count == 3)
 
 	TEST(@"-[containsObject:]",
 	    [list containsObject: strings[1]] &&
@@ -77,13 +80,14 @@
 	    [list containsObjectIdenticalTo: strings[1]] &&
 	    ![list containsObjectIdenticalTo:
 	    [OFString stringWithString: strings[1]]])
 
 	TEST(@"-[copy]", (list = [[list copy] autorelease]) &&
-	    [list.firstListItem->object isEqual: strings[0]] &&
-	    [list.firstListItem->next->object isEqual: strings[1]] &&
-	    [list.lastListItem->object isEqual: strings[2]])
+	    [list.firstObject isEqual: strings[0]] &&
+	    [OFListItemObject(OFListItemNext(list.firstListItem))
+	    isEqual: strings[1]] &&
+	    [list.lastObject isEqual: strings[2]])
 
 	TEST(@"-[isEqual:]", [list isEqual: [[list copy] autorelease]])
 
 	TEST(@"-[description]",
 	    [list.description isEqual: @"[\n\tFoo,\n\tBar,\n\tBaz\n]"])
@@ -92,14 +96,14 @@
 
 	iter = list.firstListItem;
 	i = 0;
 	ok = true;
 	while ((obj = [enumerator nextObject]) != nil) {
-		if (![obj isEqual: iter->object])
+		if (![obj isEqual: OFListItemObject(iter)])
 			ok = false;
 
-		iter = iter->next;
+		iter = OFListItemNext(iter);
 		i++;
 	}
 
 	if (list.count != i)
 		ok = false;
@@ -116,14 +120,14 @@
 	iter = list.firstListItem;
 	i = 0;
 	ok = true;
 
 	for (OFString *object in list) {
-		if (![object isEqual: iter->object])
+		if (![object isEqual: OFListItemObject(iter)])
 			ok = false;
 
-		iter = iter->next;
+		iter = OFListItemNext(iter);
 		i++;
 	}
 
 	if (list.count != i)
 		ok = false;