@@ -51,11 +51,11 @@
 - (of_list_object_t*)last
 {
 	return last;
 }
 
-- (of_list_object_t*)append: (id)obj
+- (of_list_object_t*)append: (OFObject*)obj
 {
 	of_list_object_t *o;
 
 	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = [obj retain];
@@ -74,11 +74,11 @@
 	[obj retain];
 
 	return o;
 }
 
-- (of_list_object_t*)prepend: (id)obj
+- (of_list_object_t*)prepend: (OFObject*)obj
 {
 	of_list_object_t *o;
 
 	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = [obj retain];
@@ -97,11 +97,11 @@
 	[obj retain];
 
 	return o;
 }
 
-- (of_list_object_t*)insert: (id)obj
+- (of_list_object_t*)insert: (OFObject*)obj
 		     before: (of_list_object_t*)listobj
 {
 	of_list_object_t *o;
 
 	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
@@ -122,11 +122,11 @@
 	[obj retain];
 
 	return o;
 }
 
-- (of_list_object_t*)insert: (id)obj
+- (of_list_object_t*)insert: (OFObject*)obj
 		      after: (of_list_object_t*)listobj
 {
 	of_list_object_t *o;
 
 	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
@@ -173,22 +173,22 @@
 - (size_t)count
 {
 	return count;
 }
 
-- (BOOL)isEqual: (id)obj
+- (BOOL)isEqual: (OFObject*)obj
 {
 	of_list_object_t *iter, *iter2;
 
 	if (![obj isKindOfClass: [OFList class]])
 		return NO;
 
-	if ([obj count] != count)
+	if ([(OFList*)obj count] != count)
 		return NO;
 
-	for (iter = first, iter2 = [obj first]; iter != NULL && iter2 != NULL;
-	    iter = iter->next, iter2 = iter2->next)
+	for (iter = first, iter2 = [(OFList*)obj first]; iter != NULL &&
+	    iter2 != NULL; iter = iter->next, iter2 = iter2->next)
 		if (![iter->object isEqual: iter2->object])
 			return NO;
 
 	/* One is bigger than the other although we checked the count */
 	assert(iter == NULL && iter2 == NULL);