@@ -573,29 +573,36 @@
 	[self finishInitialization];
 
 	return self.stringByDeletingLastPathComponent;
 }
 
-- (intmax_t)decimalValue
+- (long long)longLongValue
+{
+	[self finishInitialization];
+
+	return self.longLongValue;
+}
+
+- (long long)longLongValueWithBase: (int)base
+{
+	[self finishInitialization];
+
+	return [self longLongValueWithBase: base];
+}
+
+- (unsigned long long)unsignedLongLongValue
 {
 	[self finishInitialization];
 
-	return self.decimalValue;
+	return self.unsignedLongLongValue;
 }
 
-- (uintmax_t)hexadecimalValue
+- (unsigned long long)unsignedLongLongValueWithBase: (int)base
 {
 	[self finishInitialization];
 
-	return self.hexadecimalValue;
-}
-
-- (uintmax_t)octalValue
-{
-	[self finishInitialization];
-
-	return self.octalValue;
+	return [self unsignedLongLongValueWithBase: base];
 }
 
 - (float)floatValue
 {
 	[self finishInitialization];