@@ -70,21 +70,21 @@
 	size_t _toRead;
 }
 
 @property (nonatomic, setter=of_setKeepAlive:) bool of_keepAlive;
 
-- initWithSocket: (OFTCPSocket *)socket;
+- initWithSocket: (OFTCPSocket *)sock;
 @end
 
 @implementation OFHTTPClientResponse
 @synthesize of_keepAlive = _keepAlive;
 
-- initWithSocket: (OFTCPSocket *)socket
+- initWithSocket: (OFTCPSocket *)sock
 {
 	self = [super init];
 
-	_socket = [socket retain];
+	_socket = [sock retain];
 
 	return self;
 }
 
 - (void)dealloc
@@ -286,34 +286,33 @@
 }
 
 - (OFTCPSocket *)of_closeAndCreateSocketForRequest: (OFHTTPRequest *)request
 {
 	OFURL *URL = [request URL];
-	OFTCPSocket *socket;
+	OFTCPSocket *sock;
 
 	[self close];
 
 	if ([[URL scheme] isEqual: @"https"]) {
 		if (of_tls_socket_class == Nil)
 			@throw [OFUnsupportedProtocolException
 			    exceptionWithURL: URL];
 
-		socket = [[[of_tls_socket_class alloc] init]
-		    autorelease];
+		sock = [[[of_tls_socket_class alloc] init] autorelease];
 	} else
-		socket = [OFTCPSocket socket];
+		sock = [OFTCPSocket socket];
 
 	if ([_delegate respondsToSelector:
 	    @selector(client:didCreateSocket:request:)])
 		[_delegate client: self
-		  didCreateSocket: socket
+		  didCreateSocket: sock
 			  request: request];
 
-	[socket connectToHost: [URL host]
-			 port: [URL port]];
+	[sock connectToHost: [URL host]
+		       port: [URL port]];
 
-	return socket;
+	return sock;
 }
 
 - (OFHTTPResponse *)performRequest: (OFHTTPRequest *)request
 			 redirects: (size_t)redirects
 {
@@ -324,11 +323,11 @@
 	OFString *path;
 	OFMutableString *requestString;
 	OFString *user, *password;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
 	OFData *body = [request body];
-	OFTCPSocket *socket;
+	OFTCPSocket *sock;
 	OFHTTPClientResponse *response;
 	OFString *line, *version, *redirect, *connectionHeader;
 	bool keepAlive;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *serverHeaders;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
@@ -345,11 +344,11 @@
 		/*
 		 * Set _socket to nil, so that in case of an error it won't be
 		 * reused. If everything is successful, we set _socket again
 		 * at the end.
 		 */
-		socket = [_socket autorelease];
+		sock = [_socket autorelease];
 		_socket = nil;
 
 		[_lastURL release];
 		_lastURL = nil;
 
@@ -369,11 +368,11 @@
 		} @finally {
 			[_lastResponse release];
 			_lastResponse = nil;
 		}
 	} else
-		socket = [self of_closeAndCreateSocketForRequest: request];
+		sock = [self of_closeAndCreateSocketForRequest: request];
 
 	/*
 	 * As a work around for a bug with split packets in lighttpd when using
 	 * HTTPS, we construct the complete request in a buffer string and then
 	 * send it all at once.
@@ -470,26 +469,26 @@
 		[requestString appendFormat: @"%@: %@\r\n", key, object];
 
 	[requestString appendString: @"\r\n"];
 
 	@try {
-		[socket writeString: requestString];
+		[sock writeString: requestString];
 	} @catch (OFWriteFailedException *e) {
 		if ([e errNo] != ECONNRESET && [e errNo] != EPIPE)
 			@throw e;
 
 		/* Reconnect in case a keep-alive connection timed out */
-		socket = [self of_closeAndCreateSocketForRequest: request];
-		[socket writeString: requestString];
+		sock = [self of_closeAndCreateSocketForRequest: request];
+		[sock writeString: requestString];
 	}
 
 	if (body != nil)
-		[socket writeBuffer: [body items]
-			     length: [body count] * [body itemSize]];
+		[sock writeBuffer: [body items]
+			   length: [body count] * [body itemSize]];
 
 	@try {
-		line = [socket readLine];
+		line = [sock readLine];
 	} @catch (OFInvalidEncodingException *e) {
 		@throw [OFInvalidServerReplyException exception];
 	}
 
 	/*
@@ -496,20 +495,19 @@
 	 * It's possible that the write succeeds on a connection that is
 	 * keep-alive, but the connection has already been closed by the remote
 	 * end due to a timeout. In this case, we need to reconnect.
 	 */
 	if (line == nil) {
-		socket = [self of_closeAndCreateSocketForRequest: request];
-		[socket writeString: requestString];
+		sock = [self of_closeAndCreateSocketForRequest: request];
+		[sock writeString: requestString];
 
 		if (body != nil)
-			[socket writeBuffer: [body items]
-				     length: [body count] *
-					     [body itemSize]];
+			[sock writeBuffer: [body items]
+				   length: [body count] * [body itemSize]];
 
 		@try {
-			line = [socket readLine];
+			line = [sock readLine];
 		} @catch (OFInvalidEncodingException *e) {
 			@throw [OFInvalidServerReplyException exception];
 		}
 	}
 
@@ -525,16 +523,16 @@
 	status = (int)[[line substringWithRange: of_range(9, 3)] decimalValue];
 
 	serverHeaders = [OFMutableDictionary dictionary];
 
 	for (;;) {
-		OFString *key, *value, *old;
+		OFString *value, *old;
 		const char *lineC, *tmp;
 		char *keyC;
 
 		@try {
-			line = [socket readLine];
+			line = [sock readLine];
 		} @catch (OFInvalidEncodingException *e) {
 			@throw [OFInvalidServerReplyException exception];
 		}
 
 		if (line == nil)
@@ -585,11 +583,11 @@
 		[_delegate     client: self
 		    didReceiveHeaders: serverHeaders
 			   statusCode: status
 			      request: request];
 
-	response = [[[OFHTTPClientResponse alloc] initWithSocket: socket]
+	response = [[[OFHTTPClientResponse alloc] initWithSocket: sock]
 	    autorelease];
 	[response setProtocolVersionFromString: version];
 	[response setStatusCode: status];
 	[response setHeaders: serverHeaders];
 
@@ -609,11 +607,11 @@
 	}
 
 	if (keepAlive) {
 		[response of_setKeepAlive: true];
 
-		_socket = [socket retain];
+		_socket = [sock retain];
 		_lastURL = [URL copy];
 		_lastWasHEAD = (method == OF_HTTP_REQUEST_METHOD_HEAD);
 		_lastResponse = [response retain];
 	}
 
@@ -669,13 +667,10 @@
 			 * 303 means the request should be converted to a GET
 			 * request before redirection. This also means stripping
 			 * the entity of the request.
 			 */
 			if (status == 303) {
-				OFEnumerator *keyEnumerator, *objectEnumerator;
-				id key, object;
-
 				keyEnumerator = [headers keyEnumerator];
 				objectEnumerator = [headers objectEnumerator];
 				while ((key = [keyEnumerator nextObject]) !=
 				    nil &&
 				    (object = [objectEnumerator nextObject]) !=