@@ -23,10 +23,11 @@
 #import "OFNumber.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
 
 #import "autorelease.h"
+#import "macros.h"
 
 static struct {
 	Class isa;
 } placeholder;
 
@@ -96,12 +97,11 @@
 {
 }
 
 - (void)dealloc
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 
 	/* Get rid of a stupid warning */
 	[super dealloc];
 }
 @end
@@ -137,12 +137,11 @@
 	return [super init];
 }
 
 - (size_t)countForObject: (id)object
 {
-	[self doesNotRecognizeSelector: _cmd];
-	abort();
+	OF_UNRECOGNIZED_SELECTOR
 }
 
 - (OFString*)description
 {
 	OFMutableString *ret;