@@ -35,12 +35,12 @@
 @end
 
 static bool
 isWhitespaceLine(OFString *line)
 {
-	const char *cString = [line UTF8String];
-	size_t length = [line UTF8StringLength];
+	const char *cString = line.UTF8String;
+	size_t length = line.UTF8StringLength;
 
 	for (size_t i = 0; i < length; i++)
 		if (!of_ascii_isspace(cString[i]))
 			return false;
 
@@ -100,11 +100,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFINICategory *category;
 
 	for (category in _categories)
-		if ([[category name] isEqual: name])
+		if ([category.name isEqual: name])
 			return category;
 
 	category = [[[OFINICategory alloc] of_initWithName: name] autorelease];
 	[_categories addObject: category];
 
@@ -124,11 +124,11 @@
 	@try {
 		file = [OFFile fileWithPath: path
 				       mode: @"r"];
 	} @catch (OFOpenItemFailedException *e) {
 		/* Handle missing file like an empty file */
-		if ([e errNo] == ENOENT)
+		if (e.errNo == ENOENT)
 			return;
 
 		@throw e;
 	}
 
@@ -141,11 +141,11 @@
 
 			if (![line hasSuffix: @"]"])
 				@throw [OFInvalidFormatException exception];
 
 			categoryName = [line substringWithRange:
-			    of_range(1, [line length] - 2)];
+			    of_range(1, line.length - 2)];
 
 			category = [[[OFINICategory alloc]
 			    of_initWithName: categoryName] autorelease];
 			[_categories addObject: category];
 		} else {