@@ -93,11 +93,11 @@
 			}
 			break;
 		case STATE_NAME:
 			if (characters[i] == '=') {
 				name = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				state = STATE_EXPECT_VALUE;
 			}
 			break;
 		case STATE_EXPECT_VALUE:
 			if (characters[i] == '"') {
@@ -111,11 +111,11 @@
 			i--;
 			break;
 		case STATE_VALUE:
 			if (characters[i] == ';' || characters[i] == ',') {
 				value = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				[ret addObject:
 				    [OFHTTPCookie cookieWithName: name
 							   value: value
 							  domain: domain]];
@@ -125,11 +125,11 @@
 			}
 			break;
 		case STATE_QUOTED_VALUE:
 			if (characters[i] == '"') {
 				value = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 				[ret addObject:
 				    [OFHTTPCookie cookieWithName: name
 							   value: value
 							  domain: domain]];
 
@@ -153,18 +153,18 @@
 			}
 			break;
 		case STATE_ATTR_NAME:
 			if (characters[i] == '=') {
 				name = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				state = STATE_ATTR_VALUE;
 				last = i + 1;
 			} else if (characters[i] == ';' ||
 			    characters[i] == ',') {
 				name = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				handleAttribute(ret.lastObject, name, nil);
 
 				state = (characters[i] == ';'
 				    ? STATE_PRE_ATTR_NAME : STATE_PRE_NAME);
@@ -172,11 +172,11 @@
 
 			break;
 		case STATE_ATTR_VALUE:
 			if (characters[i] == ';' || characters[i] == ',') {
 				value = [string substringWithRange:
-				    of_range(last, i - last)];
+				    OFMakeRange(last, i - last)];
 
 				/*
 				 * Expires often contains a comma, even though
 				 * the comma is used as a separator for
 				 * concatenating headers as per RFC 2616,
@@ -213,11 +213,11 @@
 	case STATE_QUOTED_VALUE:
 		@throw [OFInvalidFormatException exception];
 		break;
 	case STATE_VALUE:
 		value = [string substringWithRange:
-		    of_range(last, length - last)];
+		    OFMakeRange(last, length - last)];
 		[ret addObject: [OFHTTPCookie cookieWithName: name
 						       value: value
 						      domain: domain]];
 		break;
 	/* We end up here if the cookie is just foo= */
@@ -227,18 +227,18 @@
 						      domain: domain]];
 		break;
 	case STATE_ATTR_NAME:
 		if (last != length) {
 			name = [string substringWithRange:
-			    of_range(last, length - last)];
+			    OFMakeRange(last, length - last)];
 
 			handleAttribute(ret.lastObject, name, nil);
 		}
 		break;
 	case STATE_ATTR_VALUE:
 		value = [string substringWithRange:
-		    of_range(last, length - last)];
+		    OFMakeRange(last, length - last)];
 
 		handleAttribute(ret.lastObject, name, value);
 
 		break;
 	}