@@ -22,10 +22,11 @@
 
 #import "OFMutableSet.h"
 #import "OFMutableSet_hashtable.h"
 
 #import "autorelease.h"
+#import "macros.h"
 
 static struct {
 	Class isa;
 } placeholder;
 
@@ -95,12 +96,11 @@
 {
 }
 
 - (void)dealloc
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 
 	/* Get rid of a stupid warning */
 	[super dealloc];
 }
 @end
@@ -135,18 +135,16 @@
 	return [super init];
 }
 
 - (void)addObject: (id)object
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)removeObject: (id)object
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (void)minusSet: (OFSet*)set
 {
 	void *pool = objc_autoreleasePoolPush();