@@ -84,28 +84,28 @@
 - (OFString*)stringByXMLUnescapingWithDelegate:
     (id <OFStringXMLUnescapingDelegate>)delegate
 {
 	const char *string;
 	size_t i, last, length;
-	BOOL inEntity;
+	bool inEntity;
 	OFMutableString *ret;
 
 	string = [self UTF8String];
 	length = [self UTF8StringLength];
 
 	ret = [OFMutableString string];
 
 	last = 0;
-	inEntity = NO;
+	inEntity = false;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
 				       length: i - last];
 
 			last = i + 1;
-			inEntity = YES;
+			inEntity = true;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
@@ -165,11 +165,11 @@
 			} else
 				@throw [OFInvalidEncodingException
 				    exceptionWithClass: [self class]];
 
 			last = i + 1;
-			inEntity = NO;
+			inEntity = false;
 		}
 	}
 
 	if (inEntity)
 		@throw [OFInvalidEncodingException
@@ -187,28 +187,28 @@
 - (OFString*)stringByXMLUnescapingWithBlock:
     (of_string_xml_unescaping_block_t)block
 {
 	const char *string;
 	size_t i, last, length;
-	BOOL inEntity;
+	bool inEntity;
 	OFMutableString *ret;
 
 	string = [self UTF8String];
 	length = [self UTF8StringLength];
 
 	ret = [OFMutableString string];
 
 	last = 0;
-	inEntity = NO;
+	inEntity = false;
 
 	for (i = 0; i < length; i++) {
 		if (!inEntity && string[i] == '&') {
 			[ret appendUTF8String: string + last
 				       length: i - last];
 
 			last = i + 1;
-			inEntity = YES;
+			inEntity = true;
 		} else if (inEntity && string[i] == ';') {
 			const char *entity = string + last;
 			size_t entityLength = i - last;
 
 			if (entityLength == 2 && !memcmp(entity, "lt", 2))
@@ -265,11 +265,11 @@
 				[ret appendString: tmp];
 				objc_autoreleasePoolPop(pool);
 			}
 
 			last = i + 1;
-			inEntity = NO;
+			inEntity = false;
 		}
 	}
 
 	if (inEntity)
 		@throw [OFInvalidEncodingException