diff --git a/VERSION b/VERSION
index 091cdd7..358bffc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2301.11846
+0.2301.11859
diff --git a/src/Data/MariaDB/MariaDBResult.php b/src/Data/MariaDB/MariaDBResult.php
index a8f0a61..590c23c 100644
--- a/src/Data/MariaDB/MariaDBResult.php
+++ b/src/Data/MariaDB/MariaDBResult.php
@@ -1,7 +1,7 @@
 <?php
 // MariaDBResult.php
 // Created: 2021-05-02
-// Updated: 2022-02-16
+// Updated: 2023-01-01
 
 namespace Index\Data\MariaDB;
 
@@ -82,11 +82,11 @@ abstract class MariaDBResult implements IDbResult {
     }
 
     public function getInteger(int|string $index): int {
-        return intval($this->getValue($index));
+        return (int)$this->getValue($index);
     }
 
     public function getFloat(int|string $index): float {
-        return floatval($this->getValue($index));
+        return (float)$this->getValue($index);
     }
 
     public function getStream(int|string $index): ?Stream {
diff --git a/src/Data/SQLite/SQLiteResult.php b/src/Data/SQLite/SQLiteResult.php
index 2704544..2ff7584 100644
--- a/src/Data/SQLite/SQLiteResult.php
+++ b/src/Data/SQLite/SQLiteResult.php
@@ -1,7 +1,7 @@
 <?php
 // SQLiteResult.php
 // Created: 2021-05-02
-// Updated: 2022-02-16
+// Updated: 2023-01-01
 
 namespace Index\Data\SQLite;
 
@@ -68,11 +68,11 @@ class SQLiteResult implements IDbResult {
     }
 
     public function getInteger(int|string $index): int {
-        return intval($this->getValue($index));
+        return (int)$this->getValue($index);
     }
 
     public function getFloat(int|string $index): float {
-        return floatval($this->getValue($index));
+        return (float)$this->getValue($index);
     }
 
     /**
diff --git a/src/Http/Headers/AcceptEncodingHeader.php b/src/Http/Headers/AcceptEncodingHeader.php
index d879de3..77bc965 100644
--- a/src/Http/Headers/AcceptEncodingHeader.php
+++ b/src/Http/Headers/AcceptEncodingHeader.php
@@ -1,7 +1,7 @@
 <?php
 // AcceptEncodingHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -53,7 +53,7 @@ class AcceptEncodingHeader {
 
                 foreach($part as $param) {
                     if(substr($param, 0, 2) === 'q=') {
-                        $algo->quality = min(0, max(1, floatval(substr($param, 2))));
+                        $algo->quality = min(0, max(1, (float)substr($param, 2)));
                         break;
                     }
                 }
diff --git a/src/Http/Headers/AcceptLanguageHeader.php b/src/Http/Headers/AcceptLanguageHeader.php
index 868bf93..62f3325 100644
--- a/src/Http/Headers/AcceptLanguageHeader.php
+++ b/src/Http/Headers/AcceptLanguageHeader.php
@@ -1,7 +1,7 @@
 <?php
 // AcceptLanguageHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -54,7 +54,7 @@ class AcceptLanguageHeader {
 
                 foreach($part as $param) {
                     if(substr($param, 0, 2) === 'q=') {
-                        $lang->quality = min(0, max(1, floatval(substr($param, 2))));
+                        $lang->quality = min(0, max(1, (float)substr($param, 2)));
                         break;
                     }
                 }
diff --git a/src/Http/Headers/AcceptTransferEncodingHeader.php b/src/Http/Headers/AcceptTransferEncodingHeader.php
index aa933d1..c19c4e1 100644
--- a/src/Http/Headers/AcceptTransferEncodingHeader.php
+++ b/src/Http/Headers/AcceptTransferEncodingHeader.php
@@ -1,7 +1,7 @@
 <?php
 // AcceptTransferEncodingHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -53,7 +53,7 @@ class AcceptTransferEncodingHeader {
 
                 foreach($part as $param) {
                     if(substr($param, 0, 2) === 'q=') {
-                        $algo->quality = min(0, max(1, floatval(substr($param, 2))));
+                        $algo->quality = min(0, max(1, (float)substr($param, 2)));
                         break;
                     }
                 }
diff --git a/src/Http/Headers/ContentLengthHeader.php b/src/Http/Headers/ContentLengthHeader.php
index e24df96..aefa395 100644
--- a/src/Http/Headers/ContentLengthHeader.php
+++ b/src/Http/Headers/ContentLengthHeader.php
@@ -1,7 +1,7 @@
 <?php
 // ContentLengthHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -19,6 +19,6 @@ class ContentLengthHeader {
     }
 
     public static function parse(HttpHeader $header): ContentLengthHeader {
-        return new ContentLengthHeader(intval($header->getFirstLine()));
+        return new ContentLengthHeader((int)$header->getFirstLine());
     }
 }
diff --git a/src/Http/Headers/ContentRangeHeader.php b/src/Http/Headers/ContentRangeHeader.php
index e909c1d..052517f 100644
--- a/src/Http/Headers/ContentRangeHeader.php
+++ b/src/Http/Headers/ContentRangeHeader.php
@@ -1,7 +1,7 @@
 <?php
 // ContentRangeHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -56,7 +56,7 @@ class ContentRangeHeader {
 
         $size = trim($parts[1] ?? '*');
         if($size !== '*')
-            $size = max(0, intval($size));
+            $size = max(0, (int)$size);
         else
             $size = -1;
 
@@ -64,8 +64,8 @@ class ContentRangeHeader {
 
         if($range !== '*') {
             $parts = explode('-', $range, 2);
-            $rangeStart = intval(trim($parts[0]));
-            $rangeEnd = intval(trim($parts[1] ?? '0'));
+            $rangeStart = (int)trim($parts[0]);
+            $rangeEnd = (int)trim($parts[1] ?? '0');
         } else
             $rangeStart = $rangeEnd = -1;
 
diff --git a/src/Http/Headers/ExpectHeader.php b/src/Http/Headers/ExpectHeader.php
index ca48e0d..061444a 100644
--- a/src/Http/Headers/ExpectHeader.php
+++ b/src/Http/Headers/ExpectHeader.php
@@ -1,7 +1,7 @@
 <?php
 // ExpectHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-14
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -26,6 +26,6 @@ class ExpectHeader {
 
     public static function parse(HttpHeader $header): ExpectHeader {
         $value = explode('-', $header->getFirstLine(), 2);
-        return new ExpectHeader(intval($value[0]), $value[1] ?? '');
+        return new ExpectHeader((int)$value[0], $value[1] ?? '');
     }
 }
diff --git a/src/Http/Headers/HostHeader.php b/src/Http/Headers/HostHeader.php
index f50422c..7f7a54a 100644
--- a/src/Http/Headers/HostHeader.php
+++ b/src/Http/Headers/HostHeader.php
@@ -1,7 +1,7 @@
 <?php
 // HostHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-14
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -30,6 +30,6 @@ class HostHeader {
 
     public static function parse(HttpHeader $header): HostHeader {
         $parts = explode(':', $header->getFirstLine(), 2);
-        return new HostHeader($parts[0], intval($parts[1] ?? '-1'));
+        return new HostHeader($parts[0], (int)($parts[1] ?? '-1'));
     }
 }
diff --git a/src/Http/Headers/KeepAliveHeader.php b/src/Http/Headers/KeepAliveHeader.php
index a40217f..2e0b92e 100644
--- a/src/Http/Headers/KeepAliveHeader.php
+++ b/src/Http/Headers/KeepAliveHeader.php
@@ -1,7 +1,7 @@
 <?php
 // KeepAliveHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-15
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -31,9 +31,9 @@ class KeepAliveHeader {
 
         foreach($params as $param) {
             if(str_starts_with($param, 'timeout='))
-                $timeOut = intval(substr($param, 8));
+                $timeOut = (int)substr($param, 8);
             elseif(str_starts_with($param, 'max='))
-                $max = intval(substr($param, 4));
+                $max = (int)substr($param, 4);
             if($timeOut >= 0 && $max >= 0)
                 break;
         }
diff --git a/src/Http/Headers/RangeHeader.php b/src/Http/Headers/RangeHeader.php
index d3feb8e..516ce48 100644
--- a/src/Http/Headers/RangeHeader.php
+++ b/src/Http/Headers/RangeHeader.php
@@ -1,7 +1,7 @@
 <?php
 // RangeHeader.php
 // Created: 2022-02-14
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http\Headers;
 
@@ -45,14 +45,14 @@ class RangeHeader {
 
             if($start === '' && is_numeric($end)) {
                 $range->type = 'suffix-length';
-                $range->length = intval($end);
+                $range->length = (int)$end;
             } elseif(is_numeric($start) && $end === '') {
                 $range->type = 'start';
-                $range->start = intval($start);
+                $range->start = (int)$start;
             } else {
                 $range->type = 'range';
-                $range->start = intval($start);
-                $range->end = intval($end);
+                $range->start = (int)$start;
+                $range->end = (int)$end;
             }
         }
 
diff --git a/src/Http/HttpRequest.php b/src/Http/HttpRequest.php
index 3ec2283..8f4e57f 100644
--- a/src/Http/HttpRequest.php
+++ b/src/Http/HttpRequest.php
@@ -1,7 +1,7 @@
 <?php
 // HttpRequest.php
 // Created: 2022-02-08
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Http;
 
@@ -93,7 +93,7 @@ class HttpRequest extends HttpMessage {
                     $contentType = null;
                 }
             elseif($nameLower === 'content-length')
-                $contentLength = intval($value);
+                $contentLength = (int)$value;
 
             $build->setHeader($name, $value);
         }
diff --git a/src/Net/DnsEndPoint.php b/src/Net/DnsEndPoint.php
index bbfd310..4eb64c1 100644
--- a/src/Net/DnsEndPoint.php
+++ b/src/Net/DnsEndPoint.php
@@ -1,7 +1,7 @@
 <?php
 // DnsEndPoint.php
 // Created: 2021-05-02
-// Updated: 2022-02-28
+// Updated: 2023-01-01
 
 namespace Index\Net;
 
@@ -49,7 +49,7 @@ class DnsEndPoint extends EndPoint implements Stringable {
         $parts = explode(':', $string);
         if(count($parts) < 2)
             throw new InvalidArgumentException('$string is not a valid host and port combo.');
-        return new DnsEndPoint($parts[0], intval($parts[1]));
+        return new DnsEndPoint($parts[0], (int)$parts[1]);
     }
 
     public function __toString(): string {
diff --git a/src/Net/IPAddressRange.php b/src/Net/IPAddressRange.php
index 84fa27f..5ef4658 100644
--- a/src/Net/IPAddressRange.php
+++ b/src/Net/IPAddressRange.php
@@ -1,7 +1,7 @@
 <?php
 // IPAddressRange.php
 // Created: 2021-04-26
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Net;
 
@@ -92,6 +92,6 @@ final class IPAddressRange implements JsonSerializable, Stringable, IEquatable {
         $parts = explode('/', $cidr, 2);
         if(empty($parts[0]) || empty($parts[1]))
             throw new InvalidArgumentException('$cidr is not a valid CIDR range.');
-        return new static(IPAddress::parse($parts[0]), intval($parts[1]));
+        return new static(IPAddress::parse($parts[0]), (int)$parts[1]);
     }
 }
diff --git a/src/Net/IPEndPoint.php b/src/Net/IPEndPoint.php
index a6ab445..1ac936b 100644
--- a/src/Net/IPEndPoint.php
+++ b/src/Net/IPEndPoint.php
@@ -1,7 +1,7 @@
 <?php
 // IPEndPoint.php
 // Created: 2021-04-30
-// Updated: 2022-02-28
+// Updated: 2023-01-01
 
 namespace Index\Net;
 
@@ -51,13 +51,13 @@ class IPEndPoint extends EndPoint {
             if($closing === false)
                 throw new InvalidArgumentException('$string is not a valid IP end point.');
             $ip = substr($string, 1, $closing - 1);
-            $port = intval(substr($string, $closing + 2));
+            $port = (int)substr($string, $closing + 2);
         } else { // IPv4
             $parts = explode(':', $string, 2);
             if(count($parts) < 2)
                 throw new InvalidArgumentException('$string is not a valid IP end point.');
             $ip = $parts[0];
-            $port = intval($parts[1]);
+            $port = (int)$parts[1];
         }
 
         return new IPEndPoint(IPAddress::parse($ip), $port);
diff --git a/src/Serialisation/Base62Serialiser.php b/src/Serialisation/Base62Serialiser.php
index 0825631..c500bf6 100644
--- a/src/Serialisation/Base62Serialiser.php
+++ b/src/Serialisation/Base62Serialiser.php
@@ -1,7 +1,7 @@
 <?php
 // Base62Serialiser.php
 // Created: 2022-01-28
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Serialisation;
 
@@ -20,7 +20,7 @@ class Base62Serialiser extends Serialiser {
      * @return string Base64 string representing the integer.
      */
     public function serialise(mixed $input): string {
-        $input = intval($input);
+        $input = (int)$input;
         $output = '';
 
         for($i = floor(log10($input) / log10(62)); $i >= 0; --$i) {
diff --git a/src/Serialisation/BencodeSerialiser.php b/src/Serialisation/BencodeSerialiser.php
index 823d83d..72076ba 100644
--- a/src/Serialisation/BencodeSerialiser.php
+++ b/src/Serialisation/BencodeSerialiser.php
@@ -1,7 +1,7 @@
 <?php
 // BencodeSerialiser.php
 // Created: 2022-01-13
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index\Serialisation;
 
@@ -108,7 +108,7 @@ class BencodeSerialiser extends Serialiser {
                     $number .= $char;
                 }
 
-                return intval($number);
+                return (int)$number;
 
             case 'l':
                 $list = [];
@@ -165,7 +165,7 @@ class BencodeSerialiser extends Serialiser {
                     $length .= $char;
                 }
 
-                return $input->read(intval($length));
+                return $input->read((int)$length);
         }
     }
 }
diff --git a/src/XString.php b/src/XString.php
index a55e67f..5850a1c 100644
--- a/src/XString.php
+++ b/src/XString.php
@@ -1,7 +1,7 @@
 <?php
 // XString.php
 // Created: 2022-02-03
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 namespace Index;
 
@@ -14,11 +14,11 @@ final class XString {
     }
 
     public static function toInt(string $value, int $base = 10): int {
-        return intval($value, $base);
+        return $base === 10 ? (int)$value : intval($value, $base);
     }
 
     public static function toFloat(string $value): float {
-        return floatval($value);
+        return (float)$value;
     }
 
     public static function escape(
diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
index 77132ed..84183de 100644
--- a/tests/EnvironmentTest.php
+++ b/tests/EnvironmentTest.php
@@ -1,7 +1,7 @@
 <?php
 // EnvironmentTest.php
 // Created: 2021-05-02
-// Updated: 2022-02-27
+// Updated: 2023-01-01
 
 declare(strict_types=1);
 
@@ -32,9 +32,9 @@ final class EnvironmentTest extends TestCase {
         $rawVersion = explode('.', $strVersion);
         $version = Environment::getIndexVersion();
 
-        $this->assertEquals(intval($rawVersion[0]), $version->getMajor());
-        $this->assertEquals(intval($rawVersion[1]), $version->getMinor());
-        $this->assertEquals(intval($rawVersion[2]), $version->getPatch());
+        $this->assertEquals((int)$rawVersion[0], $version->getMajor());
+        $this->assertEquals((int)$rawVersion[1], $version->getMinor());
+        $this->assertEquals((int)$rawVersion[2], $version->getPatch());
         $this->assertEquals($strVersion, (string)$version);
     }