@@ -18,10 +18,11 @@
 #import "OFConstCString.h"
 #import "OFConstWideCString.h"
 #import "OFCString.h"
 #import "OFWideCString.h"
 #import "OFExceptions.h"
+#import "OFMacros.h"
 
 @implementation OFString
 + newAsConstCString: (const char*)str
 {
 	return [[OFConstCString alloc] initAsConstCString: str];
@@ -42,27 +43,21 @@
 	return [[OFWideCString alloc] initAsWideCString: str];
 }
 
 - (char*)cString
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(cString)] raise];
-	return NULL;
+	OF_NOT_IMPLEMENTED(NULL)
 }
 
 - (wchar_t*)wcString
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(wcString)] raise];
-	return NULL;
+	OF_NOT_IMPLEMENTED(NULL)
 }
 
 - (size_t)length
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(length)] raise];
-	return 0;
+	OF_NOT_IMPLEMENTED(0)
 }
 
 - (OFString*)setTo: (OFString*)str
 {
 	[self free];
@@ -70,42 +65,28 @@
 	return self;
 }
 
 - (OFString*)clone
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(clone)] raise];
-	return nil;
+	OF_NOT_IMPLEMENTED(nil)
 }
 
 - (int)compareTo: (OFString*)str
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(compareTo:)]
-	    raise];
-	return 0;
+	OF_NOT_IMPLEMENTED(0)
 }
 
 - (OFString*)append: (OFString*)str
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(append:)] raise];
-	return nil;
+	OF_NOT_IMPLEMENTED(nil)
 }
 
 - (OFString*)appendCString: (const char*)str
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(appendCString:)]
-	    raise];
-	return nil;
+	OF_NOT_IMPLEMENTED(nil)
 }
 
 - (OFString*)appendWideCString: (const wchar_t*)str
 {
-	[[OFNotImplementedException newWithObject: self
-				      andSelector: @selector(
-						       appendWideCString:)]
-	    raise];
-	return nil;
+	OF_NOT_IMPLEMENTED(nil)
 }
 @end