@@ -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];
 
-		_characters = [[element stringValue] copy];
+		_characters = [element.stringValue copy];
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -88,11 +88,11 @@
 	return ([characters->_characters isEqual: _characters]);
 }
 
 - (uint32_t)hash
 {
-	return [_characters hash];
+	return _characters.hash;
 }
 
 - (OFString *)stringValue
 {
 	return [[_characters copy] autorelease];
@@ -105,31 +105,31 @@
 	[old release];
 }
 
 - (OFString *)XMLString
 {
-	return [_characters stringByXMLEscaping];
+	return _characters.stringByXMLEscaping;
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 {
-	return [_characters stringByXMLEscaping];
+	return _characters.stringByXMLEscaping;
 }
 
 - (OFString *)XMLStringWithIndentation: (unsigned int)indentation
 				 level: (unsigned int)level
 {
-	return [_characters stringByXMLEscaping];
+	return _characters.stringByXMLEscaping;
 }
 
 - (OFString *)description
 {
-	return [_characters stringByXMLEscaping];
+	return _characters.stringByXMLEscaping;
 }
 
 - (OFXMLElement *)XMLElementBySerializing
 {
-	return [OFXMLElement elementWithName: [self className]
+	return [OFXMLElement elementWithName: self.className
 				   namespace: OF_SERIALIZATION_NS
 				 stringValue: _characters];
 }
 @end