Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -111,11 +111,11 @@
 
 @implementation OFArray
 + (void)initialize
 {
 	if (self == [OFArray class])
-		object_setClass((id)&placeholder, [OFArray_placeholder class]);
+		placeholder.isa = [OFArray_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFArray class])

Index: src/OFBlock.m
==================================================================
--- src/OFBlock.m
+++ src/OFBlock.m
@@ -177,12 +177,12 @@
 
 	if (object_getClass((id)block) == (Class)&_NSConcreteStackBlock) {
 		of_block_literal_t *copy;
 
 		if ((copy = malloc(block->descriptor->size)) == NULL) {
-			object_setClass((id)&alloc_failed_exception,
-			    [OFAllocFailedException class]);
+			alloc_failed_exception.isa =
+			    [OFAllocFailedException class];
 			@throw (OFAllocFailedException*)&alloc_failed_exception;
 		}
 		memcpy(copy, block, block->descriptor->size);
 
 		object_setClass((id)copy, (Class)&_NSConcreteMallocBlock);
@@ -265,12 +265,12 @@
 		of_block_byref_t *src = (of_block_byref_t*)src_;
 		of_block_byref_t **dst = (of_block_byref_t**)dst_;
 
 		if ((src->flags & OF_BLOCK_REFCOUNT_MASK) == 0) {
 			if ((*dst = malloc(src->size)) == NULL) {
-				object_setClass((id)&alloc_failed_exception,
-				    [OFAllocFailedException class]);
+				alloc_failed_exception.isa =
+				    [OFAllocFailedException class];
 				@throw (OFAllocFailedException*)
 				    &alloc_failed_exception;
 			}
 
 			if (src->forwarding == src)

Index: src/OFCountedSet.m
==================================================================
--- src/OFCountedSet.m
+++ src/OFCountedSet.m
@@ -106,12 +106,11 @@
 
 @implementation OFCountedSet
 + (void)initialize
 {
 	if (self == [OFCountedSet class])
-		object_setClass((id)&placeholder,
-		    [OFCountedSet_placeholder class]);
+		placeholder.isa = [OFCountedSet_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFCountedSet class])

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -120,12 +120,11 @@
 
 @implementation OFDictionary
 + (void)initialize
 {
 	if (self == [OFDictionary class])
-		object_setClass((id)&placeholder,
-		    [OFDictionary_placeholder class]);
+		placeholder.isa = [OFDictionary_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFDictionary class])

Index: src/OFMutableArray.m
==================================================================
--- src/OFMutableArray.m
+++ src/OFMutableArray.m
@@ -147,12 +147,11 @@
 
 @implementation OFMutableArray
 + (void)initialize
 {
 	if (self == [OFMutableArray class])
-		object_setClass((id)&placeholder,
-		    [OFMutableArray_placeholder class]);
+		placeholder.isa = [OFMutableArray_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFMutableArray class])

Index: src/OFMutableDictionary.m
==================================================================
--- src/OFMutableDictionary.m
+++ src/OFMutableDictionary.m
@@ -116,12 +116,11 @@
 
 @implementation OFMutableDictionary
 + (void)initialize
 {
 	if (self == [OFMutableDictionary class])
-		object_setClass((id)&placeholder,
-		    [OFMutableDictionary_placeholder class]);
+		placeholder.isa = [OFMutableDictionary_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFMutableDictionary class])

Index: src/OFMutableSet.m
==================================================================
--- src/OFMutableSet.m
+++ src/OFMutableSet.m
@@ -105,12 +105,11 @@
 
 @implementation OFMutableSet
 + (void)initialize
 {
 	if (self == [OFMutableSet class])
-		object_setClass((id)&placeholder,
-		    [OFMutableSet_placeholder class]);
+		placeholder.isa = [OFMutableSet_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFMutableSet class])

Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -241,12 +241,11 @@
 
 @implementation OFMutableString
 + (void)initialize
 {
 	if (self == [OFMutableString class])
-		object_setClass((id)&placeholder,
-		    [OFMutableString_placeholder class]);
+		placeholder.isa = [OFMutableString_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFMutableString class])

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -186,12 +186,11 @@
 
 	instance = malloc(PRE_IVAR_ALIGN + instanceSize +
 	    extraAlignment + extraSize);
 
 	if OF_UNLIKELY (instance == nil) {
-		object_setClass((id)&alloc_failed_exception,
-		    [OFAllocFailedException class]);
+		alloc_failed_exception.isa = [OFAllocFailedException class];
 		@throw (id)&alloc_failed_exception;
 	}
 
 	((struct pre_ivar*)instance)->retainCount = 1;
 	((struct pre_ivar*)instance)->firstMem = NULL;

Index: src/OFPlugin.m
==================================================================
--- src/OFPlugin.m
+++ src/OFPlugin.m
@@ -54,11 +54,11 @@
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 
 	objc_autoreleasePoolPop(pool);
 
-	*(void**)&initPlugin = dlsym(handle, "init_plugin");
+	initPlugin = (OFPlugin*(*)(void))dlsym(handle, "init_plugin");
 	if (initPlugin == NULL || (plugin = initPlugin()) == nil) {
 		dlclose(handle);
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];
 	}

Index: src/OFSet.m
==================================================================
--- src/OFSet.m
+++ src/OFSet.m
@@ -104,11 +104,11 @@
 
 @implementation OFSet
 + (void)initialize
 {
 	if (self == [OFSet class])
-		object_setClass((id)&placeholder, [OFSet_placeholder class]);
+		placeholder.isa = [OFSet_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFSet class])

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -339,11 +339,11 @@
 
 @implementation OFString
 + (void)initialize
 {
 	if (self == [OFString class])
-		object_setClass((id)&placeholder, [OFString_placeholder class]);
+		placeholder.isa = [OFString_placeholder class];
 }
 
 + alloc
 {
 	if (self == [OFString class])