@@ -1512,30 +1512,30 @@
 }
 
 - (bool)isEqual: (id)object
 {
 	void *pool;
-	OFString *otherString;
+	OFString *string;
 	const of_unichar_t *characters, *otherCharacters;
 	size_t length;
 
 	if (object == self)
 		return true;
 
 	if (![object isKindOfClass: [OFString class]])
 		return false;
 
-	otherString = object;
+	string = object;
 	length = self.length;
 
-	if (otherString.length != length)
+	if (string.length != length)
 		return false;
 
 	pool = objc_autoreleasePoolPush();
 
 	characters = self.characters;
-	otherCharacters = otherString.characters;
+	otherCharacters = string.characters;
 
 	if (memcmp(characters, otherCharacters,
 	    length * sizeof(of_unichar_t)) != 0) {
 		objc_autoreleasePoolPop(pool);
 		return false;
@@ -1554,31 +1554,29 @@
 - (id)mutableCopy
 {
 	return [[OFMutableString alloc] initWithString: self];
 }
 
-- (of_comparison_result_t)compare: (id <OFComparing>)object
+- (of_comparison_result_t)compare: (OFString *)string
 {
 	void *pool;
-	OFString *otherString;
 	const of_unichar_t *characters, *otherCharacters;
 	size_t minimumLength;
 
-	if (object == self)
+	if (string == self)
 		return OF_ORDERED_SAME;
 
-	if (![(id)object isKindOfClass: [OFString class]])
+	if (![string isKindOfClass: [OFString class]])
 		@throw [OFInvalidArgumentException exception];
 
-	otherString = (OFString *)object;
-	minimumLength = (self.length > otherString.length
-	    ? otherString.length : self.length);
+	minimumLength = (self.length > string.length
+	    ? string.length : self.length);
 
 	pool = objc_autoreleasePoolPush();
 
 	characters = self.characters;
-	otherCharacters = otherString.characters;
+	otherCharacters = string.characters;
 
 	for (size_t i = 0; i < minimumLength; i++) {
 		if (characters[i] > otherCharacters[i]) {
 			objc_autoreleasePoolPop(pool);
 			return OF_ORDERED_DESCENDING;
@@ -1590,31 +1588,31 @@
 		}
 	}
 
 	objc_autoreleasePoolPop(pool);
 
-	if (self.length > otherString.length)
+	if (self.length > string.length)
 		return OF_ORDERED_DESCENDING;
-	if (self.length < otherString.length)
+	if (self.length < string.length)
 		return OF_ORDERED_ASCENDING;
 
 	return OF_ORDERED_SAME;
 }
 
-- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)otherString
+- (of_comparison_result_t)caseInsensitiveCompare: (OFString *)string
 {
 	void *pool = objc_autoreleasePoolPush();
 	const of_unichar_t *characters, *otherCharacters;
 	size_t length, otherLength, minimumLength;
 
-	if (otherString == self)
+	if (string == self)
 		return OF_ORDERED_SAME;
 
 	characters = self.characters;
-	otherCharacters = otherString.characters;
+	otherCharacters = string.characters;
 	length = self.length;
-	otherLength = otherString.length;
+	otherLength = string.length;
 
 	minimumLength = (length > otherLength ? otherLength : length);
 
 	for (size_t i = 0; i < minimumLength; i++) {
 		of_unichar_t c = characters[i];