@@ -115,22 +115,22 @@
 	if (!of_tlskey_new(&threadSelfKey))
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 }
 
-+ thread
++ (instancetype)thread
 {
 	return [[[self alloc] init] autorelease];
 }
 
-+ threadWithObject: (id)object
++ (instancetype)threadWithObject: (id)object
 {
 	return [[[self alloc] initWithObject: object] autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-+ threadWithBlock: (of_thread_block_t)block
++ (instancetype)threadWithBlock: (of_thread_block_t)block
 {
 	return [[[self alloc] initWithBlock: block] autorelease];
 }
 #endif
 
@@ -368,16 +368,16 @@
 {
 	if (self == [OFTLSKey class])
 		TLSKeys = [[OFList alloc] init];
 }
 
-+ TLSKey
++ (instancetype)TLSKey
 {
 	return [[[self alloc] init] autorelease];
 }
 
-+ TLSKeyWithDestructor: (void(*)(id))destructor
++ (instancetype)TLSKeyWithDestructor: (void(*)(id))destructor
 {
 	return [[[self alloc] initWithDestructor: destructor] autorelease];
 }
 
 + (void)callAllDestructors
@@ -444,11 +444,11 @@
 	[super dealloc];
 }
 @end
 
 @implementation OFMutex
-+ mutex
++ (instancetype)mutex
 {
 	return [[[self alloc] init] autorelease];
 }
 
 - init
@@ -552,11 +552,11 @@
 	[super dealloc];
 }
 @end
 
 @implementation OFCondition
-+ condition
++ (instancetype)condition
 {
 	return [[[self alloc] init] autorelease];
 }
 
 - init