@@ -49,21 +49,21 @@
 	return [[[self alloc] initWithJID: JID
 				     node: node
 				     name: name] autorelease];
 }
 
-- initWithJID: (XMPPJID *)JID
-	 node: (OFString *)node
+- (instancetype)initWithJID: (XMPPJID *)JID
+		       node: (OFString *)node
 {
 	return [self initWithJID: JID
 			    node: node
 			    name: nil];
 }
 
-- initWithJID: (XMPPJID *)JID
-	 node: (OFString *)node
-	 name: (OFString *)name
+- (instancetype)initWithJID: (XMPPJID *)JID
+		       node: (OFString *)node
+		       name: (OFString *)name
 {
 	self = [super init];
 
 	@try {
 		if (JID == nil &&
@@ -118,17 +118,15 @@
 {
 	[_childNodes setObject: node
 			forKey: [node node]];
 }
 
-- (bool)XMPP_handleItemsIQ: (XMPPIQ *)IQ
+- (bool)xmpp_handleItemsIQ: (XMPPIQ *)IQ
 		connection: (XMPPConnection *)connection
 {
 	XMPPIQ *resultIQ;
 	OFXMLElement *response;
-	XMPPDiscoNode *child;
-	OFEnumerator *enumerator;
 	OFXMLElement *query = [IQ elementForName: @"query"
 				       namespace: XMPP_NS_DISCO_ITEMS];
 	OFString *node = [[query attributeForName: @"node"] stringValue];
 
 	if (!(node == _node) && ![node isEqual: _node])
@@ -137,12 +135,11 @@
 	resultIQ = [IQ resultIQ];
 	response = [OFXMLElement elementWithName: @"query"
 				       namespace: XMPP_NS_DISCO_ITEMS];
 	[resultIQ addChild: response];
 
-	enumerator = [_childNodes objectEnumerator];
-	while ((child = [enumerator nextObject])) {
+	for (XMPPDiscoNode *child in _childNodes) {
 		OFXMLElement *item =
 		    [OFXMLElement elementWithName: @"item"
 					namespace: XMPP_NS_DISCO_ITEMS];
 
 		[item addAttributeWithName: @"jid"
@@ -160,26 +157,22 @@
 	[connection sendStanza: resultIQ];
 
 	return true;
 }
 
-- (bool)XMPP_handleInfoIQ: (XMPPIQ *)IQ
+- (bool)xmpp_handleInfoIQ: (XMPPIQ *)IQ
 	       connection: (XMPPConnection *)connection
 {
 	XMPPIQ *resultIQ;
 	OFXMLElement *response;
-	OFEnumerator *enumerator;
-	OFString *feature;
-	XMPPDiscoIdentity *identity;
 
 	resultIQ = [IQ resultIQ];
 	response = [OFXMLElement elementWithName: @"query"
 				       namespace: XMPP_NS_DISCO_INFO];
 	[resultIQ addChild: response];
 
-	enumerator = [_identities objectEnumerator];
-	while ((identity = [enumerator nextObject])) {
+	for (XMPPDiscoIdentity *identity in _identities) {
 		OFXMLElement *identityElement =
 		    [OFXMLElement elementWithName: @"identity"
 					namespace: XMPP_NS_DISCO_INFO];
 
 		[identityElement addAttributeWithName: @"category"
@@ -191,12 +184,11 @@
 						  stringValue: [identity name]];
 
 		[response addChild: identityElement];
 	}
 
-	enumerator = [_features objectEnumerator];
-	while ((feature = [enumerator nextObject])) {
+	for (OFString *feature in _features) {
 		OFXMLElement *featureElement =
 		    [OFXMLElement elementWithName: @"feature"
 					namespace: XMPP_NS_DISCO_INFO];
 		[featureElement addAttributeWithName: @"var"
 					 stringValue: feature];