@@ -293,32 +293,32 @@
 - (void)handleConnection
 {
 	char buffer[512];
 
 	for (;;) {
-		size_t length = [sock readNBytes: 512
-				      intoBuffer: buffer];
+		size_t length = [sock readIntoBuffer: buffer
+					      length: 512];
 
 		[self parseBuffer: buffer
-		       withLength: length];
+			   length: length];
 
 		if (length < 1)
 			return;
 	}
 }
 
 - (void)parseBuffer: (const char*)buffer
-	 withLength: (size_t)length
+	     length: (size_t)length
 {
 	if (length < 1) {
 		[delegates broadcastSelector: @selector(connectionWasClosed:)
 				  withObject: self];
 		return;
 	}
 
 	[parser parseBuffer: buffer
-		 withLength: length];
+		     length: length];
 
 	[oldParser release];
 	[oldElementBuilder release];
 
 	oldParser = nil;