@@ -217,19 +217,19 @@
 	id ret;
 
 	if ([key hasPrefix: @"@"]) {
 		void *pool = objc_autoreleasePoolPush();
 
-		key = [key substringWithRange: of_range(1, [key length] - 1)];
+		key = [key substringWithRange: of_range(1, key.length - 1)];
 		ret = [[super valueForKey: key] retain];
 
 		objc_autoreleasePoolPop(pool);
 
 		return [ret autorelease];
 	}
 
-	ret = [OFMutableSet setWithCapacity: [self count]];
+	ret = [OFMutableSet setWithCapacity: self.count];
 
 	for (id object in self) {
 		id value = [object valueForKey: key];
 
 		if (value != nil)
@@ -245,11 +245,11 @@
 	  forKey: (OFString *)key
 {
 	if ([key hasPrefix: @"@"]) {
 		void *pool = objc_autoreleasePoolPush();
 
-		key = [key substringWithRange: of_range(1, [key length] - 1)];
+		key = [key substringWithRange: of_range(1, key.length - 1)];
 		[super setValue: value
 			 forKey: key];
 
 		objc_autoreleasePoolPop(pool);
 		return;
@@ -287,11 +287,11 @@
 	if (![object isKindOfClass: [OFSet class]])
 		return false;
 
 	set = object;
 
-	if ([set count] != [self count])
+	if (set.count != self.count)
 		return false;
 
 	return [set isSubsetOfSet: self];
 }
 
@@ -310,11 +310,11 @@
 
 - (OFString *)description
 {
 	void *pool;
 	OFMutableString *ret;
-	size_t i, count = [self count];
+	size_t i, count = self.count;
 
 	if (count == 0)
 		return @"{()}";
 
 	ret = [OFMutableString stringWithString: @"{(\n"];
@@ -384,11 +384,11 @@
 					      namespace: OF_SERIALIZATION_NS];
 
 	for (id <OFSerialization> object in self) {
 		void *pool2 = objc_autoreleasePoolPush();
 
-		[element addChild: [object XMLElementBySerializing]];
+		[element addChild: object.XMLElementBySerializing];
 
 		objc_autoreleasePoolPop(pool2);
 	}
 
 	[element retain];