Index: src/XMPPConnection.h
==================================================================
--- src/XMPPConnection.h
+++ src/XMPPConnection.h
@@ -341,15 +341,17 @@
 			text: (OFString*)text;
 - (void)XMPP_handleIQ: (XMPPIQ*)iq;
 - (void)XMPP_handleMessage: (XMPPMessage*)message;
 - (void)XMPP_handlePresence: (XMPPPresence*)presence;
 - (void)XMPP_handleFeatures: (OFXMLElement*)element;
-- (void)XMPP_handleResourceBind: (XMPPIQ*)iq;
+- (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
+				      withIQ: (XMPPIQ*)iq;
 - (void)XMPP_sendSession;
-- (void)XMPP_handleSession: (XMPPIQ*)iq;
+- (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
+				 withIQ: (XMPPIQ*)iq;
 - (OFString*)XMPP_IDNAToASCII: (OFString*)domain;
 - (XMPPMulticastDelegate*)XMPP_delegates;
 /// \endcond
 @end
 
 @interface OFObject (XMPPConnectionDelegate) <XMPPConnectionDelegate>
 @end

Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -940,11 +940,12 @@
 
 	[iq addChild: bind];
 
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleResourceBind:)];
+		      selector: @selector(XMPP_handleResourceBindForConnection:
+				    withIQ:)];
 }
 
 - (void)XMPP_sendStreamError: (OFString*)condition
 			text: (OFString*)text
 {
@@ -963,11 +964,12 @@
 	[parser setDelegate: nil];
 	[self sendStanza: error];
 	[self close];
 }
 
-- (void)XMPP_handleResourceBind: (XMPPIQ*)iq
+- (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
+				      withIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *bindElement;
 	OFXMLElement *jidElement;
 
 	assert([[iq type] isEqual: @"result"]);
@@ -999,14 +1001,16 @@
 			     ID: [self generateStanzaID]];
 	[iq addChild: [OFXMLElement elementWithName: @"session"
 					  namespace: XMPP_NS_SESSION]];
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleSession:)];
+		      selector: @selector(
+				    XMPP_handleSessionForConnection:withIQ:)];
 }
 
-- (void)XMPP_handleSession: (XMPPIQ*)iq
+- (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
+				 withIQ: (XMPPIQ*)iq
 {
 	if (![[iq type] isEqual: @"result"])
 		assert(0);
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)

Index: src/XMPPRoster.h
==================================================================
--- src/XMPPRoster.h
+++ src/XMPPRoster.h
@@ -133,12 +133,13 @@
 
 /// \cond internal
 - (void)XMPP_addRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_updateRosterItem: (XMPPRosterItem*)rosterItem;
 - (void)XMPP_deleteRosterItem: (XMPPRosterItem*)rosterItem;
-- (void)XMPP_handleInitialRoster: (XMPPIQ*)iq;
+- (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
+				       withIQ: (XMPPIQ*)iq;
 - (XMPPRosterItem*)XMPP_rosterItemWithXMLElement: (OFXMLElement*)element;
 /// \endcond
 @end
 
 @interface OFObject (XMPPRosterDelegate) <XMPPRosterDelegate>
 @end

Index: src/XMPPRoster.m
==================================================================
--- src/XMPPRoster.m
+++ src/XMPPRoster.m
@@ -77,11 +77,12 @@
 			     ID: [connection generateStanzaID]];
 	[iq addChild: [OFXMLElement elementWithName: @"query"
 					  namespace: XMPP_NS_ROSTER]];
 	[connection     sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleInitialRoster:)];
+		      selector: @selector(XMPP_handleInitialRosterForConnection:
+			withIQ:)];
 }
 
 - (BOOL)connection: (XMPPConnection*)connection_
       didReceiveIQ: (XMPPIQ*)iq
 {
@@ -234,11 +235,12 @@
 		[rosterItem setGroups: groups];
 
 	return rosterItem;
 }
 
-- (void)XMPP_handleInitialRoster: (XMPPIQ*)iq
+- (void)XMPP_handleInitialRosterForConnection: (XMPPConnection*)connection
+				       withIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *rosterElement;
 	OFEnumerator *enumerator;
 	OFXMLElement *element;
 	XMPPRosterItem *rosterItem = nil;