@@ -26,11 +26,11 @@
 IMP (*objc_forward_handler)(id, SEL) = NULL;
 
 IMP
 objc_not_found_handler(id obj, SEL sel)
 {
-	BOOL is_class = object_getClass(obj)->info & OBJC_CLASS_INFO_METACLASS;
+	bool is_class = object_getClass(obj)->info & OBJC_CLASS_INFO_METACLASS;
 
 	if (!(object_getClass(obj)->info & OBJC_CLASS_INFO_INITIALIZED)) {
 		Class cls = (is_class ? (Class)obj : object_getClass(obj));
 
 		objc_initialize_class(cls);
@@ -57,18 +57,17 @@
 
 	OBJC_ERROR("Selector %c[%s] is not implemented for class %s!",
 	    (is_class ? '+' : '-'), sel_getName(sel), object_getClassName(obj));
 }
 
-BOOL
+bool
 class_respondsToSelector(Class cls, SEL sel)
 {
 	if (cls == Nil)
-		return NO;
+		return false;
 
-	return (objc_sparsearray_get(cls->dtable, (uint32_t)sel->uid) != NULL
-	    ? YES : NO);
+	return (objc_sparsearray_get(cls->dtable, (uint32_t)sel->uid) != NULL);
 }
 
 #ifndef OF_ASM_LOOKUP
 static id
 nil_method(id self, SEL _cmd)