@@ -51,22 +51,21 @@
 - (OFArray OF_GENERIC(OFHTTPCookie *) *)cookies
 {
 	return [[_cookies copy] autorelease];
 }
 
-- (void)addCookie: (OFHTTPCookie *)cookie
-	   forURL: (OFURL *)URL
+- (void)addCookie: (OFHTTPCookie *)cookie forURL: (OFURL *)URL
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFString *cookieDomain, *URLHost;
 	size_t i;
 
 	if (![cookie.path hasPrefix: @"/"])
 		cookie.path = @"/";
 
 	if (cookie.secure &&
-	    [URL.scheme caseInsensitiveCompare: @"https"] != OF_ORDERED_SAME) {
+	    [URL.scheme caseInsensitiveCompare: @"https"] != OFOrderedSame) {
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
 	cookieDomain = cookie.domain.lowercaseString;
@@ -85,13 +84,11 @@
 	i = 0;
 	for (OFHTTPCookie *iter in _cookies) {
 		if ([iter.name isEqual: cookie.name] &&
 		    [iter.domain isEqual: cookie.domain] &&
 		    [iter.path isEqual: cookie.path]) {
-			[_cookies replaceObjectAtIndex: i
-					    withObject: cookie];
-
+			[_cookies replaceObjectAtIndex: i withObject: cookie];
 			objc_autoreleasePoolPop(pool);
 			return;
 		}
 
 		i++;
@@ -104,12 +101,11 @@
 
 - (void)addCookies: (OFArray OF_GENERIC(OFHTTPCookie *) *)cookies
 	    forURL: (OFURL *)URL
 {
 	for (OFHTTPCookie *cookie in cookies)
-		[self addCookie: cookie
-			 forURL: URL];
+		[self addCookie: cookie forURL: URL];
 }
 
 - (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesForURL: (OFURL *)URL
 {
 	OFMutableArray *ret = [OFMutableArray array];
@@ -123,11 +119,11 @@
 		expires = cookie.expires;
 		if (expires != nil && expires.timeIntervalSinceNow <= 0)
 			continue;
 
 		if (cookie.secure && [URL.scheme caseInsensitiveCompare:
-		    @"https"] != OF_ORDERED_SAME)
+		    @"https"] != OFOrderedSame)
 			continue;
 
 		pool = objc_autoreleasePoolPush();
 
 		cookieDomain = cookie.domain.lowercaseString;