Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -289,11 +289,11 @@
 			currentPath = [OFString
 			    stringWithPath: currentPath, component, nil];
 		else
 			currentPath = component;
 
-		if (![currentPath isEqual: @""] &&
+		if ([currentPath length] > 0 &&
 		    ![OFFile directoryExistsAtPath: currentPath])
 			[OFFile createDirectoryAtPath: currentPath];
 
 		[currentPath retain];
 

Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -173,11 +173,11 @@
 	if (requestType == OF_HTTP_REQUEST_TYPE_HEAD)
 		type = "HEAD";
 	if (requestType == OF_HTTP_REQUEST_TYPE_POST)
 		type = "POST";
 
-	if ([(path = [URL path]) isEqual: @""])
+	if ([(path = [URL path]) length] == 0)
 		path = @"/";
 
 	if ([URL query] != nil)
 		[sock writeFormat: @"%s %@?%@ HTTP/1.1\r\n",
 		    type, path, [URL query]];
@@ -260,11 +260,11 @@
 
 		if (line == nil)
 			@throw [OFInvalidServerReplyException
 			    exceptionWithClass: [self class]];
 
-		if ([line isEqual: @""])
+		if ([line length] == 0)
 			break;
 
 		lineC = [line UTF8String];
 
 		if ((tmp = strchr(lineC, ':')) == NULL)
@@ -429,11 +429,11 @@
 				} @catch (OFInvalidEncodingException *e) {
 					@throw [OFInvalidServerReplyException
 					    exceptionWithClass: [self class]];
 				}
 
-				if (![line isEqual: @""])
+				if ([line length] > 0)
 					@throw [OFInvalidServerReplyException
 					    exceptionWithClass: [self class]];
 
 				objc_autoreleasePoolPop(pool2);
 			}

Index: src/OFHTTPServer.m
==================================================================
--- src/OFHTTPServer.m
+++ src/OFHTTPServer.m
@@ -323,11 +323,11 @@
 - (BOOL)parseHeaders: (OFString*)line
 {
 	OFString *key, *value;
 	size_t pos;
 
-	if ([line isEqual: @""]) {
+	if ([line length] == 0) {
 		switch (requestType) {
 		case OF_HTTP_REQUEST_TYPE_GET:
 		case OF_HTTP_REQUEST_TYPE_HEAD:
 			state = SEND_REPLY;
 			break;

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -1946,18 +1946,18 @@
 		if (memcmp(characters + i, delimiterCharacters,
 		    delimiterLength * sizeof(of_unichar_t)))
 			continue;
 
 		component = [self substringWithRange: of_range(last, i - last)];
-		if (!skipEmpty || ![component isEqual: @""])
+		if (!skipEmpty || [component length] > 0)
 			[array addObject: component];
 
 		i += delimiterLength - 1;
 		last = i + 1;
 	}
 	component = [self substringWithRange: of_range(last, length - last)];
-	if (!skipEmpty || ![component isEqual: @""])
+	if (!skipEmpty || [component length] > 0)
 		[array addObject: component];
 
 	[array makeImmutable];
 
 	objc_autoreleasePoolPop(pool);

Index: src/OFString_UTF8.m
==================================================================
--- src/OFString_UTF8.m
+++ src/OFString_UTF8.m
@@ -1165,18 +1165,18 @@
 		if (memcmp(s->cString + i, cString, cStringLength))
 			continue;
 
 		component = [OFString stringWithUTF8String: s->cString + last
 						    length: i - last];
-		if (!skipEmpty || ![component isEqual: @""])
+		if (!skipEmpty || [component length] > 0)
 			[array addObject: component];
 
 		i += cStringLength - 1;
 		last = i + 1;
 	}
 	component = [OFString stringWithUTF8String: s->cString + last];
-	if (!skipEmpty || ![component isEqual: @""])
+	if (!skipEmpty || [component length] > 0)
 		[array addObject: component];
 
 	[array makeImmutable];
 
 	objc_autoreleasePoolPop(pool);

Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -901,11 +901,11 @@
 }
 
 - (void)setPrefix: (OFString*)prefix
      forNamespace: (OFString*)ns_
 {
-	if (prefix == nil || [prefix isEqual: @""])
+	if ([prefix length] == 0)
 		@throw [OFInvalidArgumentException
 		    exceptionWithClass: [self class]
 			      selector: _cmd];
 	if (ns_ == nil)
 		ns_ = @"";