@@ -21,11 +21,11 @@
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"Forwarding";
 static size_t forwardings = 0;
-static BOOL success = NO;
+static bool success = false;
 
 @interface ForwardingTest: OFObject
 @end
 
 @interface ForwardingTest (Test)
@@ -34,40 +34,40 @@
 @end
 
 static void
 test(id self, SEL _cmd)
 {
-	success = YES;
+	success = true;
 }
 
 @implementation ForwardingTest
-+ (BOOL)resolveClassMethod: (SEL)selector
++ (bool)resolveClassMethod: (SEL)selector
 {
 	forwardings++;
 
 	if (sel_isEqual(selector, @selector(test))) {
 		[self replaceClassMethod: @selector(test)
 		      withImplementation: (IMP)test
 			    typeEncoding: "v#:"];
-		return YES;
+		return true;
 	}
 
-	return NO;
+	return false;
 }
 
-+ (BOOL)resolveInstanceMethod: (SEL)selector
++ (bool)resolveInstanceMethod: (SEL)selector
 {
 	forwardings++;
 
 	if (sel_isEqual(selector, @selector(test))) {
 		[self replaceInstanceMethod: @selector(test)
 			 withImplementation: (IMP)test
 			       typeEncoding: "v@:"];
-		return YES;
+		return true;
 	}
 
-	return NO;
+	return false;
 }
 @end
 
 @implementation TestsAppDelegate (ForwardingTests)
 - (void)forwardingTests
@@ -78,14 +78,14 @@
 	    R([ForwardingTest test]) && success &&
 	    R([ForwardingTest test]) && forwardings == 1);
 
 	ForwardingTest *t = [[[ForwardingTest alloc] init] autorelease];
 
-	success = NO;
+	success = false;
 	forwardings = 0;
 
 	TEST(@"Forwarding a message and adding an instance method",
 	    R([t test]) && success && R([t test]) && forwardings == 1);
 
 	[pool drain];
 }
 @end