@@ -49,15 +49,15 @@
 	self = [super of_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];
 
-		_CDATA = [[element stringValue] copy];
+		_CDATA = [element.stringValue copy];
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -88,11 +88,11 @@
 	return ([CDATA->_CDATA isEqual: _CDATA]);
 }
 
 - (uint32_t)hash
 {
-	return [_CDATA hash];
+	return _CDATA.hash;
 }
 
 - (OFString *)stringValue
 {
 	return [[_CDATA copy] autorelease];
@@ -118,29 +118,29 @@
 	return [ret autorelease];
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 {
-	return [self XMLString];
+	return self.XMLString;
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 				level: (unsigned int)level
 {
-	return [self XMLString];
+	return self.XMLString;
 }
 
 - (OFString *)description
 {
-	return [self XMLString];
+	return self.XMLString;
 }
 
 - (OFXMLElement *)XMLElementBySerializing
 {
 	OFXMLElement *element =
-	    [OFXMLElement elementWithName: [self className]
+	    [OFXMLElement elementWithName: self.className
 				namespace: OF_SERIALIZATION_NS];
 	[element addChild: self];
 
 	return element;
 }
 @end