@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2013, Florian Zeitz <florob@babelmonkeys.de>
- * Copyright (c) 2013, 2016, Jonathan Schleifer <js@heap.zone>
+ * Copyright (c) 2013, 2016, 2019, Jonathan Schleifer <js@heap.zone>
  *
  * https://heap.zone/objxmpp/
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -115,11 +115,11 @@
 }
 
 - (void)addChildNode: (XMPPDiscoNode *)node
 {
 	[_childNodes setObject: node
-			forKey: [node node]];
+			forKey: node.node];
 }
 
 - (bool)xmpp_handleItemsIQ: (XMPPIQ *)IQ
 		connection: (XMPPConnection *)connection
 {
@@ -141,17 +141,17 @@
 		OFXMLElement *item =
 		    [OFXMLElement elementWithName: @"item"
 					namespace: XMPP_NS_DISCO_ITEMS];
 
 		[item addAttributeWithName: @"jid"
-			       stringValue: [[child JID] fullJID]];
-		if ([child node] != nil)
+			       stringValue: child.JID.fullJID];
+		if (child.node != nil)
 			[item addAttributeWithName: @"node"
-				       stringValue: [child node]];
-		if ([child name] != nil)
+				       stringValue: child.node];
+		if (child.name != nil)
 			[item addAttributeWithName: @"name"
-				       stringValue: [child name]];
+				       stringValue: child.name];
 
 		[response addChild: item];
 	}
 
 	[connection sendStanza: resultIQ];
@@ -174,16 +174,16 @@
 		OFXMLElement *identityElement =
 		    [OFXMLElement elementWithName: @"identity"
 					namespace: XMPP_NS_DISCO_INFO];
 
 		[identityElement addAttributeWithName: @"category"
-					  stringValue: [identity category]];
+					  stringValue: identity.category];
 		[identityElement addAttributeWithName: @"type"
-					  stringValue: [identity type]];
-		if ([identity name] != nil)
+					  stringValue: identity.type];
+		if (identity.name != nil)
 			[identityElement addAttributeWithName: @"name"
-						  stringValue: [identity name]];
+						  stringValue: identity.name];
 
 		[response addChild: identityElement];
 	}
 
 	for (OFString *feature in _features) {