@@ -226,12 +226,11 @@
 - (size_t)count
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (void)getObjects: (id *)buffer
-	   inRange: (of_range_t)range
+- (void)getObjects: (id *)buffer inRange: (of_range_t)range
 {
 	for (size_t i = 0; i < range.length; i++)
 		buffer[i] = [self objectAtIndex: range.location + i];
 }
 
@@ -423,11 +422,11 @@
 	if (self.count == 0)
 		return @"";
 
 	if (self.count == 1) {
 		OFString *component =
-		    [[self firstObject] performSelector: selector];
+		    [[self objectAtIndex: 0] performSelector: selector];
 
 		if (component == nil)
 			@throw [OFInvalidArgumentException exception];
 
 		return component;
@@ -868,11 +867,11 @@
 	__block id current;
 
 	if (count == 0)
 		return nil;
 	if (count == 1)
-		return [[[self firstObject] retain] autorelease];
+		return [[[self objectAtIndex: 0] retain] autorelease];
 
 	[self enumerateObjectsUsingBlock: ^ (id object, size_t idx,
 	    bool *stop) {
 		id new;