@@ -93,12 +93,11 @@
 		size_t pos = [domain rangeOfString: @"."].location;
 
 		if (pos == OF_NOT_FOUND)
 			return nil;
 
-		ret = [domain substringWithRange:
-		    of_range(pos + 1, domain.length - pos - 1)];
+		ret = [domain substringFromIndex: pos + 1];
 	}
 
 	return ret;
 }
 #endif
@@ -192,11 +191,11 @@
 		size_t pos;
 		OFString *address;
 
 		pos = [line rangeOfString: @"#"].location;
 		if (pos != OF_NOT_FOUND)
-			line = [line substringWithRange: of_range(0, pos)];
+			line = [line substringToIndex: pos];
 
 		components = [line
 		    componentsSeparatedByCharactersInSet: whitespaceCharacterSet
 						 options: OF_STRING_SKIP_EMPTY];
 
@@ -241,37 +240,33 @@
 {
 	@try {
 		if ([option hasPrefix: @"ndots:"]) {
 			unsigned long long number;
 
-			option = [option substringWithRange:
-			    of_range(6, option.length - 6)];
+			option = [option substringFromIndex: 6];
 			number = option.unsignedLongLongValue;
 
 			if (number > UINT_MAX)
 				@throw [OFOutOfRangeException exception];
 
 			_minNumberOfDotsInAbsoluteName = (unsigned int)number;
 		} else if ([option hasPrefix: @"timeout:"]) {
-			option = [option substringWithRange:
-			    of_range(8, option.length - 8)];
+			option = [option substringFromIndex: 8];
 
 			_timeout = option.unsignedLongLongValue;
 		} else if ([option hasPrefix: @"attempts:"]) {
 			unsigned long long number;
 
-			option = [option substringWithRange:
-			    of_range(9, option.length - 9)];
+			option = [option substringFromIndex: 9];
 			number = option.unsignedLongLongValue;
 
 			if (number > UINT_MAX)
 				@throw [OFOutOfRangeException exception];
 
 			_maxAttempts = (unsigned int)number;
 		} else if ([option hasPrefix: @"reload-period:"]) {
-			option = [option substringWithRange:
-			    of_range(14, option.length - 14)];
+			option = [option substringFromIndex: 14];
 
 			_configReloadInterval = option.unsignedLongLongValue;
 		} else if ([option isEqual: @"tcp"])
 			_usesTCP = true;
 	} @catch (OFInvalidFormatException *e) {
@@ -306,11 +301,11 @@
 		OFArray *components, *arguments;
 		OFString *option;
 
 		pos = [line indexOfCharacterFromSet: commentCharacters];
 		if (pos != OF_NOT_FOUND)
-			line = [line substringWithRange: of_range(0, pos)];
+			line = [line substringToIndex: pos];
 
 		components = [line
 		    componentsSeparatedByCharactersInSet: whitespaceCharacterSet
 						 options: OF_STRING_SKIP_EMPTY];