@@ -56,11 +56,11 @@
 	[mutableString replaceOccurrencesOfString: @"\f" withString: @"\\f"];
 	[mutableString replaceOccurrencesOfString: @"\r" withString: @"\\r"];
 	[mutableString replaceOccurrencesOfString: @"\n" withString: @"\\n"];
 	[mutableString replaceOccurrencesOfString: @"\"" withString: @"\\\""];
 
-	[mutableString prependString: @"\""];
+	[mutableString insertString: @"\"" atIndex: 0];
 	[mutableString appendString: @"\""];
 
 	[mutableString makeImmutable];
 
 	return mutableString;
@@ -72,11 +72,11 @@
 	OFMutableString *mutableString;
 
 	if (![string hasPrefix: @"\""] || ![string hasSuffix: @"\""])
 		return string;
 
-	string = [string substringWithRange: OFRangeMake(1, string.length - 2)];
+	string = [string substringWithRange: OFMakeRange(1, string.length - 2)];
 	mutableString = [[string mutableCopy] autorelease];
 
 	[mutableString replaceOccurrencesOfString: @"\\f" withString: @"\f"];
 	[mutableString replaceOccurrencesOfString: @"\\r" withString: @"\r"];
 	[mutableString replaceOccurrencesOfString: @"\\n" withString: @"\n"];