@@ -30,11 +30,11 @@
 	OFMutableString *ret = [OFMutableString string];
 	void *pool = objc_autoreleasePoolPush();
 	bool firstAfterDevice = true;
 
 	for (OFString *component in components) {
-		if ([component length] == 0)
+		if (component.length == 0)
 			continue;
 
 		if (!firstAfterDevice)
 			[ret appendString: @"/"];
 
@@ -58,12 +58,12 @@
 
 - (OFArray *)pathComponents
 {
 	OFMutableArray OF_GENERIC(OFString *) *ret = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
-	const char *cString = [self UTF8String];
-	size_t i, last = 0, cStringLength = [self UTF8StringLength];
+	const char *cString = self.UTF8String;
+	size_t i, last = 0, cStringLength = self.UTF8StringLength;
 
 	if (cStringLength == 0) {
 		objc_autoreleasePoolPop(pool);
 		return ret;
 	}
@@ -103,11 +103,11 @@
 	 * AmigaOS needs the full parsing to determine the last path component.
 	 * This could be optimized by not creating the temporary objects,
 	 * though.
 	 */
 	void *pool = objc_autoreleasePoolPush();
-	OFString *ret = [[self pathComponents] lastObject];
+	OFString *ret = self.pathComponents.lastObject;
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
@@ -116,20 +116,20 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *ret, *fileName;
 	size_t pos;
 
-	fileName = [self lastPathComponent];
+	fileName = self.lastPathComponent;
 	pos = [fileName rangeOfString: @"."
 			      options: OF_STRING_SEARCH_BACKWARDS].location;
 	if (pos == OF_NOT_FOUND || pos == 0) {
 		objc_autoreleasePoolPop(pool);
 		return @"";
 	}
 
 	ret = [fileName substringWithRange:
-	    of_range(pos + 1, [fileName length] - pos - 1)];
+	    of_range(pos + 1, fileName.length - pos - 1)];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
@@ -139,27 +139,27 @@
 	/*
 	 * AmigaOS needs the full parsing to delete the last path component.
 	 * This could be optimized, though.
 	 */
 	void *pool = objc_autoreleasePoolPush();
-	OFArray OF_GENERIC(OFString *) *components = [self pathComponents];
-	size_t count = [components count];
+	OFArray OF_GENERIC(OFString *) *components = self.pathComponents;
+	size_t count = components.count;
 	OFString *ret;
 
 	if (count < 2) {
-		if ([[components firstObject] hasSuffix: @":"]) {
-			ret = [[components firstObject] retain];
+		if ([components.firstObject hasSuffix: @":"]) {
+			ret = [components.firstObject retain];
 			objc_autoreleasePoolPop(pool);
 			return [ret autorelease];
 		}
 
 		objc_autoreleasePoolPop(pool);
 		return @"";
 	}
 
 	components = [components objectsInRange:
-	    of_range(0, [components count] - 1)];
+	    of_range(0, components.count - 1)];
 	ret = [OFString pathWithComponents: components];
 
 	[ret retain];
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
@@ -170,26 +170,26 @@
 	void *pool;
 	OFMutableArray OF_GENERIC(OFString *) *components;
 	OFString *ret, *fileName;
 	size_t pos;
 
-	if ([self length] == 0)
+	if (self.length == 0)
 		return [[self copy] autorelease];
 
 	pool = objc_autoreleasePoolPush();
-	components = [[[self pathComponents] mutableCopy] autorelease];
-	fileName = [components lastObject];
+	components = [[self.pathComponents mutableCopy] autorelease];
+	fileName = components.lastObject;
 
 	pos = [fileName rangeOfString: @"."
 			      options: OF_STRING_SEARCH_BACKWARDS].location;
 	if (pos == OF_NOT_FOUND || pos == 0) {
 		objc_autoreleasePoolPop(pool);
 		return [[self copy] autorelease];
 	}
 
 	fileName = [fileName substringWithRange: of_range(0, pos)];
-	[components replaceObjectAtIndex: [components count] - 1
+	[components replaceObjectAtIndex: components.count - 1
 			      withObject: fileName];
 
 	ret = [OFString pathWithComponents: components];
 
 	[ret retain];
@@ -203,33 +203,33 @@
 	OFArray OF_GENERIC(OFString *) *components;
 	OFMutableArray OF_GENERIC(OFString *) *array;
 	OFString *ret;
 	bool done = false;
 
-	if ([self length] == 0)
+	if (self.length == 0)
 		return @"";
 
-	components = [self pathComponents];
+	components = self.pathComponents;
 
-	if ([components count] == 1) {
+	if (components.count == 1) {
 		objc_autoreleasePoolPop(pool);
 		return [[self copy] autorelease];
 	}
 
 	array = [[components mutableCopy] autorelease];
 
 	while (!done) {
-		size_t length = [array count];
+		size_t length = array.count;
 
 		done = true;
 
 		for (size_t i = 0; i < length; i++) {
 			OFString *component = [array objectAtIndex: i];
 			OFString *parent =
 			    (i > 0 ? [array objectAtIndex: i - 1] : 0);
 
-			if ([component length] == 0) {
+			if (component.length == 0) {
 				[array removeObjectAtIndex: i];
 
 				done = false;
 				break;
 			}