@@ -38,11 +38,11 @@
 	OFList *list;
 	OFEnumerator *enumerator;
 	of_list_object_t *loe;
 	OFString *obj;
 	size_t i;
-	BOOL ok;
+	bool ok;
 
 	TEST(@"+[list]", (list = [OFList list]))
 
 	TEST(@"-[appendObject:]", [list appendObject: strings[0]] &&
 	    [list appendObject: strings[1]] && [list appendObject: strings[2]])
@@ -77,17 +77,17 @@
 	    [[list lastListObject]->object isEqual: strings[2]])
 
 	TEST(@"-[count]", [list count] == 3)
 
 	TEST(@"-[containsObject:]",
-	    [list containsObject: strings[1]] == YES &&
-	    [list containsObject: @"nonexistant"] == NO)
+	    [list containsObject: strings[1]] &&
+	    ![list containsObject: @"nonexistant"])
 
 	TEST(@"-[containsObjectIdenticalTo:]",
-	    [list containsObjectIdenticalTo: strings[1]] == YES &&
-	    [list containsObjectIdenticalTo:
-	    [OFString stringWithString: strings[1]]] == NO)
+	    [list containsObjectIdenticalTo: strings[1]] &&
+	    ![list containsObjectIdenticalTo:
+	    [OFString stringWithString: strings[1]]])
 
 	TEST(@"-[copy]", (list = [[list copy] autorelease]) &&
 	    [[list firstListObject]->object isEqual: strings[0]] &&
 	    [[list firstListObject]->next->object isEqual: strings[1]] &&
 	    [[list lastListObject]->object isEqual: strings[2]])
@@ -99,21 +99,21 @@
 
 	TEST(@"-[objectEnumerator]", (enumerator = [list objectEnumerator]))
 
 	loe = [list firstListObject];
 	i = 0;
-	ok = YES;
+	ok = true;
 	while ((obj = [enumerator nextObject]) != nil) {
 		if (![obj isEqual: loe->object])
-			ok = NO;
+			ok = false;
 
 		loe = loe->next;
 		i++;
 	}
 
 	if ([list count] != i)
-		ok = NO;
+		ok = false;
 
 	TEST(@"OFEnumerator's -[nextObject]", ok);
 
 	[enumerator reset];
 	[list removeListObject: [list firstListObject]];
@@ -124,34 +124,34 @@
 	[list prependObject: strings[0]];
 
 #ifdef OF_HAVE_FAST_ENUMERATION
 	loe = [list firstListObject];
 	i = 0;
-	ok = YES;
+	ok = true;
 
 	for (OFString *obj in list) {
 		if (![obj isEqual: loe->object])
-			ok = NO;
+			ok = false;
 
 		loe = loe->next;
 		i++;
 	}
 
 	if ([list count] != i)
-		ok = NO;
+		ok = false;
 
 	TEST(@"Fast Enumeration", ok)
 
-	ok = NO;
+	ok = false;
 	@try {
 		for (OFString *obj in list)
 			[list removeListObject: [list lastListObject]];
 	} @catch (OFEnumerationMutationException *e) {
-		ok = YES;
+		ok = true;
 	}
 
 	TEST(@"Detection of mutation during Fast Enumeration", ok)
 #endif
 
 	[pool drain];
 }
 @end