@@ -58,24 +58,27 @@
 
 	TEST(@"-[lastListObject]->previous",
 	    [[list lastListObject]->previous->object isEqual: strings[1]])
 
 	TEST(@"-[removeListObject:]",
-	    R([list removeListObject: [list lastListObject]]) &&
+	    R([list removeListObject:
+	    (of_list_object_t *)[list lastListObject]]) &&
 	    [[list lastListObject]->object isEqual: strings[1]] &&
-	    R([list removeListObject: [list firstListObject]]) &&
+	    R([list removeListObject:
+	    (of_list_object_t *)[list firstListObject]]) &&
 	    [[list firstListObject]->object isEqual:
 	    [list lastListObject]->object])
 
 	TEST(@"-[insertObject:beforeListObject:]",
 	    [list insertObject: strings[0]
-	      beforeListObject: [list lastListObject]] &&
+	      beforeListObject: (of_list_object_t *)[list lastListObject]] &&
 	    [[list lastListObject]->previous->object isEqual: strings[0]])
 
 	TEST(@"-[insertObject:afterListObject:]",
 	    [list insertObject: strings[2]
-	       afterListObject: [list firstListObject]->next] &&
+	       afterListObject: (of_list_object_t *)
+				    [list firstListObject]->next] &&
 	    [[list lastListObject]->object isEqual: strings[2]])
 
 	TEST(@"-[count]", [list count] == 3)
 
 	TEST(@"-[containsObject:]",
@@ -114,11 +117,11 @@
 		ok = false;
 
 	TEST(@"OFEnumerator's -[nextObject]", ok);
 
 	[enumerator reset];
-	[list removeListObject: [list firstListObject]];
+	[list removeListObject: (of_list_object_t *)[list firstListObject]];
 
 	EXPECT_EXCEPTION(@"Detection of mutation during enumeration",
 	    OFEnumerationMutationException, [enumerator nextObject])
 
 	[list prependObject: strings[0]];
@@ -143,11 +146,12 @@
 	ok = false;
 	@try {
 		for (OFString *obj in list) {
 			(void)obj;
 
-			[list removeListObject: [list lastListObject]];
+			[list removeListObject:
+			    (of_list_object_t *)[list lastListObject]];
 		}
 	} @catch (OFEnumerationMutationException *e) {
 		ok = true;
 	}