@@ -285,11 +285,11 @@
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFXMLElement *attributesElement, *namespacesElement;
 		OFXMLElement *childrenElement;
 		OFEnumerator *keyEnumerator, *objectEnumerator;
-		id key, object;
+		OFString *key, *object;
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
 			@throw [OFInvalidArgumentException exception];
 
@@ -326,12 +326,12 @@
 		    ![_namespaces isKindOfClass:
 		    [OFMutableDictionary class]]) || (_children != nil &&
 		    ![_children isKindOfClass: [OFMutableArray class]]))
 			@throw [OFInvalidArgumentException exception];
 
-		for (object in _attributes)
-			if (![object isKindOfClass: [OFXMLAttribute class]])
+		for (OFXMLAttribute *attribute in _attributes)
+			if (![attribute isKindOfClass: [OFXMLAttribute class]])
 				@throw [OFInvalidArgumentException exception];
 
 		keyEnumerator = [_namespaces keyEnumerator];
 		objectEnumerator = [_namespaces objectEnumerator];
 		while ((key = [keyEnumerator nextObject]) != nil &&
@@ -447,11 +447,11 @@
 	/* Add the namespaces of the current element */
 	if (allNamespaces != nil) {
 		OFEnumerator *keyEnumerator = [_namespaces keyEnumerator];
 		OFEnumerator *objectEnumerator = [_namespaces objectEnumerator];
 		OFMutableDictionary *tmp;
-		id key, object;
+		OFString *key, *object;
 
 		tmp = [[allNamespaces mutableCopy] autorelease];
 
 		while ((key = [keyEnumerator nextObject]) != nil &&
 		    (object = [objectEnumerator nextObject]) != nil)