@@ -43,12 +43,12 @@
 
 	/*
 	 * We can't use allocMemoryWithSize: here as it might be a @"" literal
 	 */
 	if ((retCString = malloc(retLength)) == NULL)
-		@throw [OFOutOfMemoryException exceptionWithClass: [self class]
-						    requestedSize: retLength];
+		@throw [OFOutOfMemoryException
+		    exceptionWithRequestedSize: retLength];
 
 	for (i = 0; i < length; i++) {
 		switch (string[i]) {
 			case '<':
 				append = "&lt;";
@@ -84,12 +84,12 @@
 
 			if ((newRetCString = realloc(retCString,
 			    retLength + appendLen)) == NULL) {
 				free(retCString);
 				@throw [OFOutOfMemoryException
-				     exceptionWithClass: [self class]
-					  requestedSize: retLength + appendLen];
+				     exceptionWithRequestedSize: retLength +
+								 appendLen];
 			}
 			retCString = newRetCString;
 			retLength += appendLen - 1;
 
 			memcpy(retCString + j, append, appendLen);