@@ -65,15 +65,13 @@
 						[line cString]];
 			[OFApplication terminateWithStatus: 1];
 		}
 		splitted_carray = [splitted cArray];
 
-		codep = [splitted_carray[0] hexadecimalValueAsInteger];
-		upperTable[codep] =
-		    [splitted_carray[12] hexadecimalValueAsInteger];
-		lowerTable[codep] =
-		    [splitted_carray[13] hexadecimalValueAsInteger];
+		codep = [splitted_carray[0] hexadecimalValue];
+		upperTable[codep] = [splitted_carray[12] hexadecimalValue];
+		lowerTable[codep] = [splitted_carray[13] hexadecimalValue];
 
 		[pool2 releaseObjects];
 	}
 
 	[pool release];
@@ -105,13 +103,12 @@
 
 		if (![splitted_carray[1] isEqual: @"S"] &&
 		    ![splitted_carray[1] isEqual: @"C"])
 			continue;
 
-		codep = [splitted_carray[0] hexadecimalValueAsInteger];
-		casefoldingTable[codep] =
-		    [splitted_carray[2] hexadecimalValueAsInteger];
+		codep = [splitted_carray[0] hexadecimalValue];
+		casefoldingTable[codep] = [splitted_carray[2] hexadecimalValue];
 
 		[pool2 releaseObjects];
 	}
 
 	[pool release];