@@ -152,15 +152,13 @@
 
 		if (port != nil) {
 			OFString *host = [OFString stringWithFormat:
 			    @"%@:%@", URL.URLEncodedHost, port];
 
-			[headers setObject: host
-				    forKey: @"Host"];
+			[headers setObject: host forKey: @"Host"];
 		} else
-			[headers setObject: [URL URLEncodedHost]
-				    forKey: @"Host"];
+			[headers setObject: URL.URLEncodedHost forKey: @"Host"];
 	}
 
 	if ((user.length > 0 || password.length > 0) &&
 	    [headers objectForKey: @"Authorization"] == nil) {
 		OFMutableData *authorizationData = [OFMutableData data];
@@ -173,12 +171,11 @@
 				      count: password.UTF8StringLength];
 
 		authorization = [OFString stringWithFormat:
 		    @"Basic %@", authorizationData.stringByBase64Encoding];
 
-		[headers setObject: authorization
-			    forKey: @"Authorization"];
+		[headers setObject: authorization forKey: @"Authorization"];
 	}
 
 	if ([headers objectForKey: @"User-Agent"] == nil)
 		[headers setObject: @"Something using ObjFW "
 				    @"<https://objfw.nil.im/>"
@@ -185,12 +182,11 @@
 			    forKey: @"User-Agent"];
 
 	if (request.protocolVersion.major == 1 &&
 	    request.protocolVersion.minor == 0 &&
 	    [headers objectForKey: @"Connection"] == nil)
-		[headers setObject: @"keep-alive"
-			    forKey: @"Connection"];
+		[headers setObject: @"keep-alive" forKey: @"Connection"];
 
 	hasContentLength = ([headers objectForKey: @"Content-Length"] != nil);
 	chunked = [[headers objectForKey: @"Transfer-Encoding"]
 	    isEqual: @"chunked"];
 
@@ -534,12 +530,11 @@
 
 	old = [_serverHeaders objectForKey: key];
 	if (old != nil)
 		value = [old stringByAppendingFormat: @",%@", value];
 
-	[_serverHeaders setObject: value
-			   forKey: key];
+	[_serverHeaders setObject: value forKey: key];
 
 	return true;
 }
 
 - (bool)stream: (OFStream *)sock