@@ -62,11 +62,11 @@
 		return;
 
 	(*pointer)++;
 
 	if (**pointer == '*') {
-		BOOL lastIsAsterisk = NO;
+		bool lastIsAsterisk = false;
 
 		(*pointer)++;
 
 		while (*pointer < stop) {
 			if (lastIsAsterisk && **pointer == '/') {
@@ -533,19 +533,19 @@
 
 static inline OFNumber*
 parseNumber(const char *restrict *pointer, const char *stop,
     size_t *restrict line)
 {
-	BOOL isHex = (*pointer + 1 < stop && (*pointer)[1] == 'x');
-	BOOL hasDecimal = NO;
+	bool isHex = (*pointer + 1 < stop && (*pointer)[1] == 'x');
+	bool hasDecimal = false;
 	size_t i;
 	OFString *string;
 	OFNumber *number;
 
 	for (i = 0; *pointer + i < stop; i++) {
 		if ((*pointer)[i] == '.')
-			hasDecimal = YES;
+			hasDecimal = true;
 
 		if ((*pointer)[i] == ' ' || (*pointer)[i] == '\t' ||
 		    (*pointer)[i] == '\r' || (*pointer)[i] == '\n' ||
 		    (*pointer)[i] == ',' || (*pointer)[i] == ']' ||
 		    (*pointer)[i] == '}') {
@@ -605,21 +605,21 @@
 		if (memcmp(*pointer, "true", 4))
 			return nil;
 
 		(*pointer) += 4;
 
-		return [OFNumber numberWithBool: YES];
+		return [OFNumber numberWithBool: true];
 	case 'f':
 		if (*pointer + 4 >= stop)
 			return nil;
 
 		if (memcmp(*pointer, "false", 5))
 			return nil;
 
 		(*pointer) += 5;
 
-		return [OFNumber numberWithBool: NO];
+		return [OFNumber numberWithBool: false];
 	case 'n':
 		if (*pointer + 3 >= stop)
 			return nil;
 
 		if (memcmp(*pointer, "null", 4))