@@ -32,10 +32,16 @@
 #import "OFMalformedXMLException.h"
 #import "OFNotImplementedException.h"
 #import "OFUnboundNamespaceException.h"
 
 #import "macros.h"
+
+/* References for static linking */
+void _references_to_categories_of_OFXMLElement(void)
+{
+	_OFXMLElement_Serialization_reference = 1;
+}
 
 @interface OFXMLElement_OFXMLElementBuilderDelegate: OFObject
 {
 @public
 	OFXMLElement *element;
@@ -319,21 +325,21 @@
 		    elementForName: @"namespaces"
 			 namespace: OF_SERIALIZATION_NS];
 		childrenElement = [element elementForName: @"children"
 						namespace: OF_SERIALIZATION_NS];
 
-		attributes = [[OFSerialization objectByDeserializingXMLElement:
-		    [attributesElement elementForName: @"object"
-					    namespace: OF_SERIALIZATION_NS]]
-		    retain];
-		namespaces = [[OFSerialization objectByDeserializingXMLElement:
-		    [namespacesElement elementForName: @"object"
-					    namespace: OF_SERIALIZATION_NS]]
-		    retain];
-		children = [[OFSerialization objectByDeserializingXMLElement:
-		    [childrenElement elementForName: @"object"
-					  namespace: OF_SERIALIZATION_NS]]
+		attributes = [[[attributesElement
+		    elementForName: @"object"
+			 namespace: OF_SERIALIZATION_NS] objectByDeserializing]
+		    retain];
+		namespaces = [[[namespacesElement
+		    elementForName: @"object"
+			 namespace: OF_SERIALIZATION_NS] objectByDeserializing]
+		    retain];
+		children = [[[childrenElement
+		    elementForName: @"object"
+			 namespace: OF_SERIALIZATION_NS] objectByDeserializing]
 		    retain];
 
 		if (!((name != nil || ns != nil || defaultNamespace != nil ||
 		    [attributes count] > 0 || [namespaces count] > 0 ||
 		    [children count] > 0) ^ (characters != nil) ^