@@ -30,11 +30,11 @@
 	OFMutableString *ret = [OFMutableString string];
 	void *pool = objc_autoreleasePoolPush();
 	bool first = true;
 
 	for (OFString *component in components) {
-		if ([component length] == 0)
+		if (component.length == 0)
 			continue;
 
 		if (!first && [component isEqual: @"/"])
 			continue;
 
@@ -60,12 +60,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;
 	}
@@ -94,12 +94,12 @@
 }
 
 - (OFString *)lastPathComponent
 {
 	void *pool = objc_autoreleasePoolPush();
-	const char *cString = [self UTF8String];
-	size_t cStringLength = [self UTF8StringLength];
+	const char *cString = self.UTF8String;
+	size_t cStringLength = self.UTF8StringLength;
 	ssize_t i;
 	OFString *ret;
 
 	if (cStringLength == 0) {
 		objc_autoreleasePoolPop(pool);
@@ -143,31 +143,31 @@
 {
 	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];
 }
 
 - (OFString *)stringByDeletingLastPathComponent
 {
 	void *pool = objc_autoreleasePoolPush();
-	const char *cString = [self UTF8String];
-	size_t cStringLength = [self UTF8StringLength];
+	const char *cString = self.UTF8String;
+	size_t cStringLength = self.UTF8StringLength;
 	OFString *ret;
 
 	if (cStringLength == 0) {
 		objc_autoreleasePoolPop(pool);
 		return @"";
@@ -207,16 +207,16 @@
 	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);
@@ -240,16 +240,16 @@
 	OFArray OF_GENERIC(OFString *) *components;
 	OFMutableArray OF_GENERIC(OFString *) *array;
 	OFString *ret;
 	bool done = false, startsWithSlash;
 
-	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];
@@ -257,21 +257,21 @@
 
 	if (startsWithSlash)
 		[array removeObjectAtIndex: 0];
 
 	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 isEqual: @"."] ||
-			   [component length] == 0) {
+			   component.length == 0) {
 				[array removeObjectAtIndex: i];
 
 				done = false;
 				break;
 			}