@@ -98,39 +98,39 @@
 	inEntity = NO;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
-				   withLength: i - last];
+				       length: i - last];
 
 			last = i + 1;
 			inEntity = YES;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
 				[ret appendCString: "<"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 2 && !memcmp(entity, "gt", 2))
 				[ret appendCString: ">"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "quot", 4))
 				[ret appendCString: "\""
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "apos", 4))
 				[ret appendCString: "'"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 3 && !memcmp(entity, "amp", 3))
 				[ret appendCString: "&"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
@@ -174,11 +174,11 @@
 	if (inEntity)
 		@throw [OFInvalidEncodingException
 		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
-		   withLength: i - last];
+		       length: i - last];
 
 	[ret makeImmutable];
 
 	return ret;
 }
@@ -201,39 +201,39 @@
 	inEntity = NO;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
-				   withLength: i - last];
+				       length: i - last];
 
 			last = i + 1;
 			inEntity = YES;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
 				[ret appendCString: "<"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 2 && !memcmp(entity, "gt", 2))
 				[ret appendCString: ">"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "quot", 4))
 				[ret appendCString: "\""
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 4 &&
 			    !memcmp(entity, "apos", 4))
 				[ret appendCString: "'"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entityLength == 3 && !memcmp(entity, "amp", 3))
 				[ret appendCString: "&"
-				      withEncoding: OF_STRING_ENCODING_ASCII
+					  encoding: OF_STRING_ENCODING_ASCII
 					    length: 1];
 			else if (entity[0] == '#') {
 				void *pool;
 				OFString *tmp;
 
@@ -274,13 +274,13 @@
 	if (inEntity)
 		@throw [OFInvalidEncodingException
 		    exceptionWithClass: [self class]];
 
 	[ret appendUTF8String: string + last
-		   withLength: i - last];
+		       length: i - last];
 
 	[ret makeImmutable];
 
 	return ret;
 }
 #endif
 @end