@@ -116,12 +116,11 @@
 {
 }
 
 - (void)dealloc
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 
 	/* Get rid of a stupid warning */
 	[super dealloc];
 }
 @end
@@ -168,12 +167,11 @@
 }
 
 - (void)setObject: (id)object
 	   forKey: (id)key
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 }
 
 -   (void)setObject: (id)object
   forKeyedSubscript: (id)key
 {
@@ -181,12 +179,11 @@
 		 forKey: key];
 }
 
 - (void)removeObjectForKey: (id)key
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)removeAllObjects
 {
 	void *pool = objc_autoreleasePoolPush();