@@ -58,16 +58,16 @@
 		objc_autoreleasePoolPop(pool);
 	}
 }
 
 static OFString*
-transform_string(OFDataArray *buffer, size_t cut, BOOL unescape,
+transform_string(OFDataArray *buffer, size_t cut, bool unescape,
     id <OFStringXMLUnescapingDelegate> delegate)
 {
 	char *items;
 	size_t i, length;
-	BOOL hasEntities = NO;
+	bool hasEntities = false;
 	OFString *ret;
 
 	items = [buffer items];
 	length = [buffer count] - cut;
 
@@ -80,11 +80,11 @@
 				i--;
 				length--;
 			} else
 				items[i] = '\n';
 		} else if (items[i] == '&')
-			hasEntities = YES;
+			hasEntities = true;
 	}
 
 	ret = [OFString stringWithUTF8String: items
 				      length: length];
 
@@ -194,11 +194,11 @@
 		dict = [OFMutableDictionary dictionaryWithKeysAndObjects:
 		    @"xml", @"http://www.w3.org/XML/1998/namespace",
 		    @"xmlns", @"http://www.w3.org/2000/xmlns/", nil];
 		[_namespaces addObject: dict];
 
-		_acceptProlog = YES;
+		_acceptProlog = true;
 		_lineNumber = 1;
 		_encoding = OF_STRING_ENCODING_UTF_8;
 		_depthLimit = 32;
 
 		objc_autoreleasePoolPop(pool);
@@ -331,11 +331,11 @@
 	if ((length = *i - *last) > 0)
 		buffer_append(_buffer, buffer + *last, _encoding, length);
 
 	if ([_buffer count] > 0) {
 		void *pool = objc_autoreleasePoolPush();
-		OFString *characters = transform_string(_buffer, 0, YES, self);
+		OFString *characters = transform_string(_buffer, 0, true, self);
 
 		if ([_delegate respondsToSelector:
 		    @selector(parser:foundCharacters:)])
 			[_delegate parser: self
 			  foundCharacters: characters];
@@ -365,44 +365,44 @@
 		_level = 0;
 		break;
 	case '/':
 		*last = *i + 1;
 		_state = OF_XMLPARSER_IN_CLOSE_TAG_NAME;
-		_acceptProlog = NO;
+		_acceptProlog = false;
 		break;
 	case '!':
 		*last = *i + 1;
 		_state = OF_XMLPARSER_IN_EXCLAMATIONMARK;
-		_acceptProlog = NO;
+		_acceptProlog = false;
 		break;
 	default:
 		if (_depthLimit > 0 && [_previous count] >= _depthLimit)
 			@throw [OFMalformedXMLException
 			    exceptionWithClass: [self class]
 					parser: self];
 
 		_state = OF_XMLPARSER_IN_TAG_NAME;
-		_acceptProlog = NO;
+		_acceptProlog = false;
 		(*i)--;
 		break;
 	}
 }
 
 /* <?xml […]?> */
-- (BOOL)OF_parseXMLProcessingInstructions: (OFString*)pi
+- (bool)OF_parseXMLProcessingInstructions: (OFString*)pi
 {
 	const char *cString;
 	size_t i, last, length;
 	int PIState = 0;
 	OFString *attribute = nil;
 	OFMutableString *value = nil;
 	char piDelimiter = 0;
 
 	if (!_acceptProlog)
-		return NO;
+		return false;
 
-	_acceptProlog = NO;
+	_acceptProlog = false;
 
 	pi = [pi substringWithRange: of_range(3, [pi length] - 3)];
 	pi = [pi stringByDeletingEnclosingWhitespaces];
 
 	cString = [pi UTF8String];
@@ -431,11 +431,11 @@
 			PIState = 2;
 
 			break;
 		case 2:
 			if (cString[i] != '\'' && cString[i] != '"')
-				return NO;
+				return false;
 
 			piDelimiter = cString[i];
 			last = i + 1;
 			PIState = 3;
 
@@ -448,11 +448,11 @@
 			    stringWithUTF8String: cString + last
 					  length: i - last];
 
 			if ([attribute isEqual: @"version"])
 				if (![value hasPrefix: @"1."])
-					return NO;
+					return false;
 
 			if ([attribute isEqual: @"encoding"]) {
 				[value lowercase];
 
 				if ([value isEqual: @"utf-8"])
@@ -465,11 +465,11 @@
 					    OF_STRING_ENCODING_ISO_8859_15;
 				else if ([value isEqual: @"windows-1252"])
 					_encoding =
 					    OF_STRING_ENCODING_WINDOWS_1252;
 				else
-					return NO;
+					return false;
 			}
 
 			last = i + 1;
 			PIState = 0;
 
@@ -476,13 +476,13 @@
 			break;
 		}
 	}
 
 	if (PIState != 0)
-		return NO;
+		return false;
 
-	return YES;
+	return true;
 }
 
 /* Inside processing instructions */
 - (void)OF_parseInProcessingInstructionsWithBuffer: (const char*)buffer
 						 i: (size_t*)i
@@ -493,11 +493,11 @@
 	else if (_level == 1 && buffer[*i] == '>') {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *PI;
 
 		buffer_append(_buffer, buffer + *last, _encoding, *i - *last);
-		PI = transform_string(_buffer, 1, NO, nil);
+		PI = transform_string(_buffer, 1, false, nil);
 
 		if ([PI isEqual: @"xml"] || [PI hasPrefix: @"xml "] ||
 		    [PI hasPrefix: @"xml\t"] || [PI hasPrefix: @"xml\r"] ||
 		    [PI hasPrefix: @"xml\n"])
 			if (![self OF_parseXMLProcessingInstructions: PI])
@@ -582,11 +582,11 @@
 				    didEndElement: _name
 					   prefix: _prefix
 					namespace: namespace];
 
 			if ([_previous count] == 0)
-				_finishedParsing = YES;
+				_finishedParsing = true;
 		} else
 			[_previous addObject: bufferString];
 
 		[_name release];
 		[_prefix release];
@@ -676,11 +676,11 @@
 	_state = (buffer[*i] == '>'
 	    ? OF_XMLPARSER_OUTSIDE_TAG
 	    : OF_XMLPARSER_EXPECT_SPACE_OR_CLOSE);
 
 	if ([_previous count] == 0)
-		_finishedParsing = YES;
+		_finishedParsing = true;
 }
 
 /* Inside a tag, name found */
 - (void)OF_parseInTagWithBuffer: (const char*)buffer
 			      i: (size_t*)i
@@ -733,11 +733,11 @@
 			    didEndElement: _name
 				   prefix: _prefix
 				namespace: namespace];
 
 		if ([_previous count] == 0)
-			_finishedParsing = YES;
+			_finishedParsing = true;
 
 		[_namespaces removeLastObject];
 	} else if (_prefix != nil) {
 		OFString *str = [OFString stringWithFormat: @"%@:%@",
 							    _prefix, _name];
@@ -839,11 +839,11 @@
 
 	if ((length = *i - *last) > 0)
 		buffer_append(_buffer, buffer + *last, _encoding, length);
 
 	pool = objc_autoreleasePoolPush();
-	attributeValue = transform_string(_buffer, 0, YES, self);
+	attributeValue = transform_string(_buffer, 0, true, self);
 
 	if (_attributePrefix == nil && [_attributeName isEqual: @"xmlns"])
 		[[_namespaces lastObject] setObject: attributeValue
 					     forKey: @""];
 	if ([_attributePrefix isEqual: @"xmlns"])
@@ -962,11 +962,11 @@
 	}
 
 	pool = objc_autoreleasePoolPush();
 
 	buffer_append(_buffer, buffer + *last, _encoding, *i - *last);
-	CDATA = transform_string(_buffer, 2, NO, nil);
+	CDATA = transform_string(_buffer, 2, false, nil);
 
 	if ([_delegate respondsToSelector: @selector(parser:foundCDATA:)])
 		[_delegate parser: self
 		       foundCDATA: CDATA];
 
@@ -1017,11 +1017,11 @@
 							    parser: self];
 
 	pool = objc_autoreleasePoolPush();
 
 	buffer_append(_buffer, buffer + *last, _encoding, *i - *last);
-	comment = transform_string(_buffer, 2, NO, nil);
+	comment = transform_string(_buffer, 2, false, nil);
 
 	if ([_delegate respondsToSelector: @selector(parser:foundComment:)])
 		[_delegate parser: self
 		     foundComment: comment];
 
@@ -1060,11 +1060,11 @@
 - (size_t)lineNumber
 {
 	return _lineNumber;
 }
 
-- (BOOL)finishedParsing
+- (bool)finishedParsing
 {
 	return _finishedParsing;
 }
 
 -	   (OFString*)string: (OFString*)string