@@ -72,11 +72,11 @@
 	OFMutableString *mutableString;
 
 	if (![string hasPrefix: @"\""] || ![string hasSuffix: @"\""])
 		return string;
 
-	string = [string substringWithRange: of_range(1, string.length - 2)];
+	string = [string substringWithRange: OFRangeMake(1, string.length - 2)];
 	mutableString = [[string mutableCopy] autorelease];
 
 	[mutableString replaceOccurrencesOfString: @"\\f" withString: @"\f"];
 	[mutableString replaceOccurrencesOfString: @"\\r" withString: @"\r"];
 	[mutableString replaceOccurrencesOfString: @"\\n" withString: @"\n"];
@@ -154,11 +154,11 @@
 		OFINICategoryPair *pair =
 		    [[[OFINICategoryPair alloc] init] autorelease];
 		OFString *key, *value;
 		size_t pos;
 
-		if ((pos = [line rangeOfString: @"="].location) == OF_NOT_FOUND)
+		if ((pos = [line rangeOfString: @"="].location) == OFNotFound)
 			@throw [OFInvalidFormatException exception];
 
 		key = unescapeString([line substringToIndex: pos]
 		    .stringByDeletingEnclosingWhitespaces);
 		value = unescapeString([line substringFromIndex: pos + 1]
@@ -466,11 +466,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (bool)of_writeToStream: (OFStream *)stream
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 		   first: (bool)first
 {
 	if (_lines.count == 0)
 		return false;