@@ -170,11 +170,11 @@
 - (id)objectAtIndex: (size_t)index
 {
 	return *((OFObject**)[array itemAtIndex: index]);
 }
 
-- (size_t)indexOfObject: (id)obj
+- (size_t)indexOfObject: (OFObject*)obj
 {
 	id *objs = [array cArray];
 	size_t i, count = [array count];
 
 	if (objs == NULL)
@@ -185,11 +185,11 @@
 			return i;
 
 	return SIZE_MAX;
 }
 
-- (size_t)indexOfObjectIdenticalTo: (id)obj
+- (size_t)indexOfObjectIdenticalTo: (OFObject*)obj
 {
 	id *objs = [array cArray];
 	size_t i, count = [array count];
 
 	if (objs == NULL)
@@ -214,26 +214,26 @@
 	id *last = [array lastItem];
 
 	return (last != NULL ? *last : nil);
 }
 
-- (BOOL)isEqual: (id)obj
+- (BOOL)isEqual: (OFObject*)obj
 {
 	OFObject **objs, **objs2;
 	size_t i, count, count2;
 
 	if (![obj isKindOfClass: [OFArray class]])
 		return NO;
 
 	count = [array count];
-	count2 = [obj count];
+	count2 = [(OFArray*)obj count];
 
 	if (count != count2)
 		return NO;
 
 	objs = [array cArray];
-	objs2 = [obj cArray];
+	objs2 = [(OFArray*)obj cArray];
 
 	for (i = 0; i < count; i++)
 		if (![objs[i] isEqual: objs2[i]])
 			return NO;
 
@@ -286,17 +286,17 @@
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- removeObject: (id)obj
+- removeObject: (OFObject*)obj
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- removeObjectIdenticalTo: (id)obj
+- removeObjectIdenticalTo: (OFObject*)obj
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }