@@ -74,12 +74,11 @@
 			     withString: @"\n"];
 
 	if (cut > 0) {
 		size_t length = [ret length];
 
-		[ret deleteCharactersFromIndex: length - cut
-				       toIndex: length];
+		[ret deleteCharactersInRange: of_range(length - cut, cut)];
 	}
 
 	if (unescape)
 		return [ret stringByXMLUnescapingWithDelegate: delegate];
 
@@ -397,12 +396,11 @@
 	if (!acceptProlog)
 		return NO;
 
 	acceptProlog = NO;
 
-	pi = [pi substringFromIndex: 3
-			    toIndex: [pi length]];
+	pi = [pi substringWithRange: of_range(3, [pi length] - 3)];
 	pi = [pi stringByDeletingEnclosingWhitespaces];
 
 	cString = [pi cString];
 	length = [pi cStringLength];