@@ -398,12 +398,12 @@
 					    removeObjectForKey: stream];
 				}
 			}
 		} else {
 #endif
-			BOOL (*func)(id, SEL, OFStream*, void*, size_t,
-			    OFException*) = (BOOL(*)(id, SEL, OFStream*, void*,
+			bool (*func)(id, SEL, OFStream*, void*, size_t,
+			    OFException*) = (bool(*)(id, SEL, OFStream*, void*,
 			    size_t, OFException*))
 			    [queueItem->_target methodForSelector:
 			    queueItem->_selector];
 
 			if (!func(queueItem->_target, queueItem->_selector,
@@ -457,12 +457,12 @@
 						    removeObjectForKey: stream];
 					}
 				}
 			} else {
 #endif
-				BOOL (*func)(id, SEL, OFStream*, void*,
-				    size_t, OFException*) = (BOOL(*)(id, SEL,
+				bool (*func)(id, SEL, OFStream*, void*,
+				    size_t, OFException*) = (bool(*)(id, SEL,
 				    OFStream*, void*, size_t, OFException*))
 				    [queueItem->_target
 				    methodForSelector: queueItem->_selector];
 
 				if (func(queueItem->_target,
@@ -515,12 +515,12 @@
 						    removeObjectForKey: stream];
 					}
 				}
 			} else {
 #endif
-				BOOL (*func)(id, SEL, OFStream*, OFString*,
-				    OFException*) = (BOOL(*)(id, SEL, OFStream*,
+				bool (*func)(id, SEL, OFStream*, OFString*,
+				    OFException*) = (bool(*)(id, SEL, OFStream*,
 				    OFString*, OFException*))
 				    [queueItem->_target methodForSelector:
 				    queueItem->_selector];
 
 				if (!func(queueItem->_target,
@@ -566,13 +566,13 @@
 					    removeObjectForKey: stream];
 				}
 			}
 		} else {
 #endif
-			BOOL (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*,
+			bool (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*,
 			    OFException*) =
-			    (BOOL(*)(id, SEL, OFTCPSocket*, OFTCPSocket*,
+			    (bool(*)(id, SEL, OFTCPSocket*, OFTCPSocket*,
 			    OFException*))
 			    [queueItem->_target methodForSelector:
 			    queueItem->_selector];
 
 			if (!func(queueItem->_target, queueItem->_selector,
@@ -593,11 +593,11 @@
 		OF_ENSURE(0);
 }
 
 - (void)run
 {
-	_running = YES;
+	_running = true;
 
 	while (_running) {
 		void *pool = objc_autoreleasePoolPush();
 		OFDate *now = [OFDate date];
 		OFTimer *timer;
@@ -660,9 +660,9 @@
 	}
 }
 
 - (void)stop
 {
-	_running = NO;
+	_running = false;
 	[_streamObserver cancel];
 }
 @end