@@ -42,19 +42,19 @@
 	self = [self init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
-		if (![[element name] isEqual: [self className]] ||
-		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
+		if (![element.name isEqual: self.className] ||
+		    ![element.namespace isEqual: OF_SERIALIZATION_NS])
 			@throw [OFInvalidArgumentException exception];
 
 		for (OFXMLElement *child in
 		    [element elementsForNamespace: OF_SERIALIZATION_NS]) {
 			void *pool2 = objc_autoreleasePoolPush();
 
-			[self appendObject: [child objectByDeserializing]];
+			[self appendObject: child.objectByDeserializing];
 
 			objc_autoreleasePoolPop(pool2);
 		}
 
 		objc_autoreleasePoolPop(pool);
@@ -214,14 +214,14 @@
 	if (![object isKindOfClass: [OFList class]])
 		return false;
 
 	list = object;
 
-	if ([list count] != _count)
+	if (list.count != _count)
 		return false;
 
-	for (iter = _firstListObject, iter2 = [list firstListObject];
+	for (iter = _firstListObject, iter2 = list.firstListObject;
 	    iter != NULL && iter2 != NULL;
 	    iter = iter->next, iter2 = iter2->next)
 		if (![iter->object isEqual: iter2->object])
 			return false;
 
@@ -354,11 +354,11 @@
 }
 
 - (OFXMLElement *)XMLElementBySerializing
 {
 	OFXMLElement *element =
-	    [OFXMLElement elementWithName: [self className]
+	    [OFXMLElement elementWithName: self.className
 				namespace: OF_SERIALIZATION_NS];
 
 	for (of_list_object_t *iter = _firstListObject;
 	    iter != NULL; iter = iter->next) {
 		void *pool = objc_autoreleasePoolPush();
@@ -413,11 +413,11 @@
 	    mutationsPointer: (unsigned long *)mutationsPtr
 {
 	self = [super init];
 
 	_list = [list retain];
-	_current = [list firstListObject];
+	_current = _list.firstListObject;
 	_mutations = *mutationsPtr;
 	_mutationsPtr = mutationsPtr;
 
 	return self;
 }
@@ -450,8 +450,8 @@
 {
 	if (*_mutationsPtr != _mutations)
 		@throw [OFEnumerationMutationException
 		    exceptionWithObject: _list];
 
-	_current = [_list firstListObject];
+	_current = _list.firstListObject;
 }
 @end