@@ -263,21 +263,11 @@
 
 		if (c >> 8 < tableSize && table[c >> 8][c & 0xFF])
 			[self setCharacter: table[c >> 8][c & 0xFF]
 				   atIndex: i];
 
-		switch (c) {
-		case ' ':
-		case '\t':
-		case '\n':
-		case '\r':
-			isStart = true;
-			break;
-		default:
-			isStart = false;
-			break;
-		}
+		isStart = of_ascii_isspace(c);
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 #else
@@ -296,21 +286,11 @@
 
 		if (c <= 0x7F)
 			[self setCharacter: (int)function(c)
 				   atIndex: i];
 
-		switch (c) {
-		case ' ':
-		case '\t':
-		case '\n':
-		case '\r':
-			isStart = true;
-			break;
-		default:
-			isStart = false;
-			break;
-		}
+		isStart = of_ascii_isspace(c);
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
@@ -568,12 +548,11 @@
 	size_t i, length = [self length];
 
 	for (i = 0; i < length; i++) {
 		of_unichar_t c = characters[i];
 
-		if (c != ' ' && c != '\t' && c != '\n' && c != '\r' &&
-		    c != '\f')
+		if (!of_ascii_isspace(c))
 			break;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
@@ -594,12 +573,11 @@
 	pool = objc_autoreleasePoolPush();
 	characters = [self characters];
 
 	d = 0;
 	for (p = characters + length - 1; p >= characters; p--) {
-		if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r' &&
-		    *p != '\f')
+		if (!of_ascii_isspace(*p))
 			break;
 
 		d++;
 	}