@@ -350,23 +350,26 @@
 	 * However, objc_allocateClassPair does not register the new class with
 	 * the subclass in the ObjC1 runtime like the ObjC2 runtime does, so
 	 * this workaround should be fine.
 	 */
 	if ((tmp = objc_allocateClassPair(self, "OFStackBlock", 0)) == NULL)
-		@throw [OFInitializationFailedException newWithClass: self];
+		@throw [OFInitializationFailedException
+		    exceptionWithClass: self];
 	memcpy(&_NSConcreteStackBlock, tmp, sizeof(_NSConcreteStackBlock));
 	free(tmp);
 	objc_registerClassPair((Class)&_NSConcreteStackBlock);
 
 	if ((tmp = objc_allocateClassPair(self, "OFGlobalBlock", 0)) == NULL)
-		@throw [OFInitializationFailedException newWithClass: self];
+		@throw [OFInitializationFailedException
+		    exceptionWithClass: self];
 	memcpy(&_NSConcreteGlobalBlock, tmp, sizeof(_NSConcreteGlobalBlock));
 	free(tmp);
 	objc_registerClassPair((Class)&_NSConcreteGlobalBlock);
 
 	if ((tmp = objc_allocateClassPair(self, "OFMallocBlock", 0)) == NULL)
-		@throw [OFInitializationFailedException newWithClass: self];
+		@throw [OFInitializationFailedException
+		    exceptionWithClass: self];
 	memcpy(&_NSConcreteMallocBlock, tmp, sizeof(_NSConcreteMallocBlock));
 	free(tmp);
 	objc_registerClassPair((Class)&_NSConcreteMallocBlock);
 }
 #endif
@@ -377,64 +380,64 @@
 	size_t i;
 
 	for (i = 0; i < NUM_SPINLOCKS; i++)
 		if (!of_spinlock_new(&spinlocks[i]))
 			@throw [OFInitializationFailedException
-			    newWithClass: self];
+			    exceptionWithClass: self];
 }
 #endif
 
 + alloc
 {
-	@throw [OFNotImplementedException newWithClass: self
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: self
+						    selector: _cmd];
 }
 
 - init
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)addMemoryToPool: (void*)ptr
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void*)allocMemoryWithSize: (size_t)size
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void*)allocMemoryForNItems: (size_t)nitems
 		     withSize: (size_t)size
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void*)resizeMemory: (void*)ptr
 	       toSize: (size_t)size
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void*)resizeMemory: (void*)ptr
 	     toNItems: (size_t)nitems
 	     withSize: (size_t)size
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - (void)freeMemory: (void*)ptr
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 }
 
 - retain
 {
 	if (isa == (Class)&_NSConcreteMallocBlock)
@@ -471,12 +474,12 @@
 		Block_release(self);
 }
 
 - (void)dealloc
 {
-	@throw [OFNotImplementedException newWithClass: isa
-					      selector: _cmd];
+	@throw [OFNotImplementedException exceptionWithClass: isa
+						    selector: _cmd];
 	[super dealloc];	/* Get rid of a stupid warning */
 }
 @end
 
 #if defined(OF_APPLE_RUNTIME) && defined(__OBJC2__)