@@ -396,18 +396,15 @@
 {
 	char *UTF8String;
 	int UTF8StringLength;
 
 	if (format == nil)
-		@throw [OFInvalidArgumentException
-		    exceptionWithClass: [self class]
-			      selector: _cmd];
+		@throw [OFInvalidArgumentException exception];
 
 	if ((UTF8StringLength = of_vasprintf(&UTF8String, [format UTF8String],
 	    arguments)) == -1)
-		@throw [OFInvalidFormatException
-		    exceptionWithClass: [self class]];
+		@throw [OFInvalidFormatException exception];
 
 	@try {
 		[self appendUTF8String: UTF8String
 				length: UTF8StringLength];
 	} @finally {
@@ -499,11 +496,11 @@
 	size_t replacementLength = [replacement length];
 	size_t i;
 
 	if (range.length > SIZE_MAX - range.location ||
 	    range.location + range.length > [self length])
-		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
+		@throw [OFOutOfRangeException exception];
 
 	if (searchLength > range.length) {
 		objc_autoreleasePoolPop(pool);
 		return;
 	}