Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -468,14 +468,12 @@
 	return class_respondsToSelector(self, selector);
 }
 
 + (bool)conformsToProtocol: (Protocol *)protocol
 {
-	Class c;
-
-	for (c = self; c != Nil; c = class_getSuperclass(c))
-		if (class_conformsToProtocol(c, protocol))
+	for (Class iter = self; iter != Nil; iter = class_getSuperclass(iter))
+		if (class_conformsToProtocol(iter, protocol))
 			return true;
 
 	return false;
 }
 
@@ -573,16 +571,16 @@
 	[self inheritMethodsFromClass: superclass];
 }
 
 + (bool)resolveClassMethod: (SEL)selector
 {
-	return NO;
+	return false;
 }
 
 + (bool)resolveInstanceMethod: (SEL)selector
 {
-	return NO;
+	return false;
 }
 
 - (instancetype)init
 {
 	return self;

Index: src/runtime/class.m
==================================================================
--- src/runtime/class.m
+++ src/runtime/class.m
@@ -56,18 +56,18 @@
 	objc_globalMutex_lock();
 
 	if (classes == NULL) {
 		objc_globalMutex_unlock();
 
-		return NO;
+		return false;
 	}
 
 	objc_hashtable_set(classes, name, (Class)((uintptr_t)class | 1));
 
 	objc_globalMutex_unlock();
 
-	return YES;
+	return true;
 }
 
 static void
 registerSelectors(Class class)
 {