From 86c56ad1bfafa14b533174d302ebf8b5ca24e28b Mon Sep 17 00:00:00 2001
From: tianfenghan <rango@swoole.com>
Date: Sun, 6 Sep 2026 18:22:12 +0800
Subject: [PATCH] Remove use native_types, add use varint_types

---
 benchmark/bench.php                           |  2 -
 benchmark/micro_bench.php                     |  2 -
 examples/array-loop/main.php                  |  2 -
 examples/array-loop/std-array.php             |  4 +-
 examples/debug/mem_leak.php                   |  2 -
 examples/error/unset-int-prop.php             |  2 -
 examples/error/unset-int-var.php              |  2 -
 examples/high-precision.php                   |  2 -
 examples/perf/class-static-prop.php           |  4 +-
 examples/perf/code.php                        |  2 -
 examples/perf/empty_class_static_prop.php     |  4 +-
 examples/pi.php                               |  2 -
 examples/wasm-hello/src/WasiDemo.php          |  2 -
 phpunit/code/assign-divide-by-zero.php        |  1 +
 phpunit/code/assign-modulo-by-zero.php        |  1 +
 .../big-numeric/bigfloat-pow-operator.php     |  2 -
 .../code/big-numeric/decimal-pow-operator.php |  2 -
 .../code/big-numeric/mixed-big-comparison.php |  2 -
 phpunit/code/bigfloat-unsupported-mod.php     |  1 -
 phpunit/code/bigfloat-unsupported-shift.php   |  1 -
 phpunit/code/bigint-post-inc.php              |  1 -
 phpunit/code/bigint-pre-inc.php               |  1 -
 phpunit/code/constant-overflow-native-add.php |  2 -
 .../constant-overflow-native-div-subtree.php  |  2 -
 phpunit/code/constant-overflow-native-div.php |  2 -
 phpunit/code/constant-overflow-native-mod.php |  2 -
 phpunit/code/constant-overflow-native-mul.php |  2 -
 phpunit/code/constant-overflow-native-neg.php |  2 -
 .../constant-overflow-native-nested-add.php   |  2 -
 .../constant-overflow-native-nested-div.php   |  2 -
 .../constant-overflow-native-nested-mod.php   |  2 -
 .../constant-overflow-native-nested-zero.php  |  2 -
 .../constant-overflow-native-nonconstant.php  |  2 -
 phpunit/code/constant-overflow-native-ok.php  |  2 -
 phpunit/code/constant-overflow-native-sub.php |  2 -
 phpunit/code/constant-overflow-warning.php    |  1 +
 .../control-flow/loop-switch-continue.php     |  2 -
 .../standalone-switch-continue.php            |  2 -
 phpunit/code/decimal-pre-dec.php              |  1 -
 phpunit/code/decimal-unsupported-bitand.php   |  1 -
 phpunit/code/decimal-unsupported-bitor.php    |  1 -
 phpunit/code/divide-by-zero-any.php           |  7 ++
 phpunit/code/divide-by-zero-int.php           |  1 +
 phpunit/code/divide-by-zero-string.php        |  1 +
 .../code/dynamic-scalar-binary-operands.php   |  2 +
 phpunit/code/hot-path-codegen.php             |  2 -
 ...iteral-declaration-initializer-varint.php} |  4 +-
 .../local-literal-declaration-initializer.php |  2 +
 phpunit/code/modulo-by-zero-int.php           |  1 +
 phpunit/code/native-bool-array-dim-write.php  |  2 -
 phpunit/code/native-float-array-dim-write.php |  2 -
 phpunit/code/native-int-array-dim-write.php   |  2 -
 ...native-method-unset-keeps-optimization.php |  2 -
 .../native-property-assign-op-class-const.php |  2 -
 .../code/native-property-assign-op-int.php    |  2 -
 phpunit/code/native-property-full-name.php    |  3 -
 .../native-property-private-other-class.php   |  2 -
 ...ive-property-protected-unrelated-class.php |  2 -
 .../native-property-static-type-mismatch.php  |  2 -
 .../native-property-this-write-conversion.php |  2 -
 .../native-property-unset-disables-hoist.php  |  2 -
 .../code/native-property-write-conversion.php |  2 -
 .../code/native-scalar-binary-operands.php    |  2 -
 .../code/nullsafe-nested-private-property.php |  2 -
 phpunit/code/nullsafe-private-property.php    |  2 -
 .../code/object-prop-subclass-mismatch.php    |  2 -
 phpunit/code/php-int-max-fold-global.php      |  1 +
 phpunit/code/php-int-max-fold-namespace.php   |  2 +
 phpunit/code/re-assign-array-to-bool.php      |  1 -
 phpunit/code/re-assign-array-to-float.php     |  1 -
 phpunit/code/re-assign-array-to-int.php       |  1 -
 phpunit/code/re-assign-array-to-obj.php       |  1 -
 phpunit/code/re-assign-bool-to-array.php      |  1 -
 phpunit/code/re-assign-bool-to-obj.php        |  1 -
 phpunit/code/re-assign-float-to-array.php     |  1 -
 phpunit/code/re-assign-float-to-obj.php       |  1 -
 phpunit/code/re-assign-int-to-array.php       |  1 -
 phpunit/code/re-assign-int-to-obj.php         |  1 -
 phpunit/code/re-assign-obj-to-array.php       |  2 -
 phpunit/code/re-assign-obj-to-bool.php        |  1 -
 phpunit/code/re-assign-obj-to-float.php       |  1 -
 phpunit/code/re-assign-obj-to-int.php         |  1 -
 phpunit/code/re-assign-obj-to-str.php         |  1 -
 phpunit/code/re-assign-str-to-array.php       |  1 -
 phpunit/code/re-assign-str-to-bool.php        |  1 -
 phpunit/code/re-assign-str-to-float.php       |  1 -
 phpunit/code/re-assign-str-to-int.php         |  1 -
 .../code/readonly-property-no-native-ref.php  |  2 -
 phpunit/code/removed-native-types.php         |  7 ++
 .../code/shift-boundary-native-neg-left.php   |  2 -
 .../code/shift-boundary-native-neg-right.php  |  2 -
 .../code/shift-boundary-native-negative.php   |  2 -
 ...shift-boundary-native-nested-neg-right.php |  2 -
 .../shift-boundary-native-nested-overflow.php |  2 -
 phpunit/code/shift-boundary-native-ok.php     |  2 -
 .../code/shift-boundary-native-overflow.php   |  2 -
 .../code/shift-boundary-native-sign-bit.php   |  2 -
 ...shift-boundary-native-wrapped-overflow.php |  2 -
 phpunit/code/shift-boundary-warning.php       |  1 +
 .../code/typed-scalar-arithmetic-codegen.php  |  1 +
 .../code/universal-method-int-undefined.php   |  1 -
 .../code/universal-method-int-wrong-args.php  |  1 -
 .../code/universal-method-literal-call.php    |  1 -
 .../code/varint-types-case-insensitive.php    | 11 +++
 phpunit/src/ClassExistsTraitFoldTest.php      |  4 +-
 phpunit/src/ConversionArityTest.php           | 10 +--
 phpunit/src/CtypeOptimizerTest.php            |  5 +-
 .../src/EvalOrderSideEffectsCodegenTest.php   | 12 +--
 phpunit/src/FuncCallOptimizerTest.php         |  4 +-
 phpunit/src/FuncCallOptimizerUnpackTest.php   |  1 -
 phpunit/src/GeneratedCodeIndentationTest.php  |  2 +-
 phpunit/src/LocalVariableInitializerTest.php  | 35 ++++----
 phpunit/src/LoopControlTest.php               |  4 +-
 phpunit/src/OperatorTest.php                  | 23 ++++--
 phpunit/src/VarIntTypesTest.php               | 71 ++++++++++++++++
 src/CompilerBase.php                          | 16 ++--
 src/Optimizer/FuncCallOptimizer.php           |  6 +-
 src/Optimizer/LoopVarOptimizer.php            |  4 +-
 src/Optimizer/SsaTypeOptimizer.php            | 44 ++++++++--
 src/Parser/AssignOpTrait.php                  | 12 +--
 src/Parser/BinaryOpTrait.php                  | 80 +++++++++++--------
 src/Parser/PropertyAccessTrait.php            |  4 +-
 src/Parser/TypeConversionTrait.php            | 12 ++-
 src/Parser/UnaryExpressionTrait.php           |  2 +-
 src/Resolver/DeclarationSymbolTrait.php       |  7 +-
 src/Translator.php                            |  6 +-
 src/polyfills.php                             |  4 +-
 tests/compiler/array_method/misc.phpt         |  2 -
 tests/compiler/basic/global-int.phpt          |  2 -
 .../basic/pow-int-overflow-native-type.phpt   |  1 -
 .../basic/pow-int-overflow-warning-php85.phpt |  1 -
 tests/compiler/basic/std_builtin.phpt         |  2 -
 tests/compiler/bigint/arithmetic.phpt         |  2 -
 tests/compiler/bigint/assign_op.phpt          |  2 -
 tests/compiler/bigint/bitwise.phpt            |  2 -
 tests/compiler/bigint/bitwise_shift.phpt      |  2 -
 tests/compiler/bigint/compare.phpt            |  2 -
 tests/compiler/bigint/divmod.phpt             |  2 -
 tests/compiler/bigint/gcd.phpt                |  2 -
 tests/compiler/bigint/literal.phpt            |  2 -
 tests/compiler/bigint/math_func_opt.phpt      |  2 -
 tests/compiler/bigint/mixed.phpt              |  2 -
 tests/compiler/bigint/operator.phpt           |  2 -
 tests/compiler/bigint/pow-right-bigint.phpt   |  2 -
 tests/compiler/bigint/pow.phpt                |  2 -
 tests/compiler/bigint/powmod.phpt             |  2 -
 tests/compiler/bigint/sqrt.phpt               |  2 -
 tests/compiler/bigint/toInt_toFloat.phpt      |  2 -
 tests/compiler/bigint/toString_cast.phpt      |  2 -
 .../bignumber/big_number_operators.phpt       |  2 -
 .../bignumber/bigfloat-high-precision.phpt    |  2 -
 .../bignumber/bigfloat_operators.phpt         |  2 -
 .../bignumber/conversions-and-boundaries.phpt |  2 -
 .../logical-and-unary-operators.phpt          |  2 -
 .../bignumber/operator-error-boundaries.phpt  |  2 -
 .../reverse-and-compound-operators.phpt       |  2 -
 ...rst-class-callable-property-optimizer.phpt |  2 -
 tests/compiler/decimal/arithmetic.phpt        |  2 -
 tests/compiler/decimal/assign_op.phpt         |  2 -
 tests/compiler/decimal/ceil.phpt              |  2 -
 tests/compiler/decimal/compare.phpt           |  2 -
 tests/compiler/decimal/divmod.phpt            |  2 -
 tests/compiler/decimal/floor.phpt             |  2 -
 tests/compiler/decimal/literal.phpt           |  4 +-
 tests/compiler/decimal/operator.phpt          |  2 -
 tests/compiler/decimal/pow.phpt               |  2 -
 tests/compiler/decimal/powmod.phpt            |  2 -
 .../precision-and-exception-boundaries.phpt   |  2 -
 tests/compiler/decimal/round.phpt             |  2 -
 tests/compiler/decimal/sqrt.phpt              |  2 -
 tests/compiler/decimal/toFloat.phpt           |  2 -
 tests/compiler/decimal/unary_minus.phpt       |  2 -
 .../call-magic-fallback-typed-object.phpt     |  2 -
 .../call-multilevel-override.phpt             |  2 -
 .../call-parent-sibling-dispatch.phpt         |  2 -
 .../dynamic_call/call-protected-override.phpt |  2 -
 tests/compiler/keyword_extension/001.phpt     |  2 -
 tests/compiler/keyword_extension/camel.phpt   |  2 -
 tests/compiler/object_property/001.phpt       |  4 +-
 tests/compiler/object_property/003.phpt       |  4 +-
 .../int-property-compound-assignment.phpt     |  1 +
 .../native-scalar-property-assign-op-var.phpt |  2 -
 .../native-scalar-property-assign-var.phpt    |  2 -
 ...scalar-property-namespaced-diagnostic.phpt |  2 -
 .../native-typed-read-in-loop.phpt            |  2 -
 ...ypes-int-property-compound-assignment.phpt |  2 -
 .../readonly-clone-initialization.phpt        |  2 -
 .../readonly-cross-class-direct.phpt          |  2 -
 .../operator/assign-op-mixed-types.phpt       |  6 +-
 .../constant-int-arithmetic-overflow.phpt     |  1 +
 .../operator/local-var-compound-overflow.phpt |  1 +
 .../operator/runtime-int-division.phpt        |  1 +
 .../operator/runtime-int-overflow-return.phpt |  1 +
 .../operator/typed-int-float-division.phpt    |  1 +
 .../optimizations/int-narrow-overflow.phpt    |  1 +
 .../loop-var-overflow-semantics.phpt          |  3 +-
 .../optimizations/narrow-div-pow.phpt         |  1 +
 .../optimizations/object-int-prop-02.phpt     |  4 +-
 .../objprop-hoist-array-var-ref.phpt          |  2 -
 .../optimizations/objprop-hoist-float.phpt    |  2 -
 .../optimizations/objprop-hoist-int.phpt      |  2 -
 .../objprop-hoist-loop-redef.phpt             |  2 -
 .../optimizations/objprop-hoist-magic.phpt    |  2 -
 .../objprop-hoist-multi-def.phpt              |  2 -
 .../objprop-hoist-nested-std-ref.phpt         |  2 -
 .../objprop-hoist-object-alias-escape.phpt    |  2 -
 .../objprop-hoist-object-arg-escape.phpt      |  2 -
 ...jprop-hoist-object-arg-reference-slot.phpt |  2 -
 .../objprop-hoist-ref-capture.phpt            |  2 -
 .../objprop-hoist-this-object-arg-escape.phpt |  2 -
 .../objprop-nullable-union-default-null.phpt  |  2 -
 .../objprop-typed-object-null-unset.phpt      |  2 -
 .../objprop-unset-fixed-defaults.phpt         |  2 -
 .../objprop-unset-this-typed.phpt             |  2 -
 ...c-prop-assign-ref-late-static-binding.phpt |  2 -
 .../static/static-prop-assign-ref-native.phpt |  2 -
 .../static-prop-assign-ref-type-error.phpt    |  2 -
 .../static-prop-dynamic-call-stable.phpt      |  2 -
 .../static-prop-late-static-binding.phpt      |  2 -
 .../static/static-prop-native-defaults.phpt   |  2 -
 .../static/static-prop-ref-slot-crash.phpt    |  2 -
 .../static-prop-ref-slot-float-crash.phpt     |  2 -
 tests/compiler/std-vector/013.phpt            |  1 -
 .../type_decl/is-null-native-scalar.phpt      |  2 -
 .../universal_method/object_extension.phpt    |  2 -
 .../object_extension_exact_name.phpt          |  2 -
 .../universal_method_call.phpt                |  2 -
 .../universal_method_extension.phpt           |  2 -
 .../universal_method_extension_camel.phpt     |  2 -
 .../universal_method_extension_chain.phpt     |  2 -
 .../universal_method_internal.phpt            |  2 -
 tests/compiler/var_convert/001.phpt           |  2 -
 .../wasm/runtime/phpx-numeric-containers.phpt |  2 -
 233 files changed, 321 insertions(+), 460 deletions(-)
 create mode 100644 phpunit/code/divide-by-zero-any.php
 rename phpunit/code/{local-literal-declaration-initializer-native.php => local-literal-declaration-initializer-varint.php} (74%)
 create mode 100644 phpunit/code/removed-native-types.php
 create mode 100644 phpunit/code/varint-types-case-insensitive.php
 create mode 100644 phpunit/src/VarIntTypesTest.php

diff --git a/benchmark/bench.php b/benchmark/bench.php
index b8ed3f9f..23407e34 100644
--- a/benchmark/bench.php
+++ b/benchmark/bench.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function simple(): void
 {
     $a = 0;
diff --git a/benchmark/micro_bench.php b/benchmark/micro_bench.php
index 8d408c77..50697227 100644
--- a/benchmark/micro_bench.php
+++ b/benchmark/micro_bench.php
@@ -1,8 +1,6 @@
 <?php
 declare(strict_types=1);
 
-use native_types;
-
 function hallo() {
 }
 
diff --git a/examples/array-loop/main.php b/examples/array-loop/main.php
index 9223a351..ba5f7514 100644
--- a/examples/array-loop/main.php
+++ b/examples/array-loop/main.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function main(int $argc, array $argv): void
 {
     $u = (int)$argv[2];
diff --git a/examples/array-loop/std-array.php b/examples/array-loop/std-array.php
index 82b49900..d7f158c8 100644
--- a/examples/array-loop/std-array.php
+++ b/examples/array-loop/std-array.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function main()
 {
     $array = std::array(std::array(std::array(Type::Int, 13), 16), 19);
@@ -11,4 +9,4 @@ function main()
 
     var_dump($array[$index2][$index][0]);
     var_dump($array[$index2][$index]);
-}
\ No newline at end of file
+}
diff --git a/examples/debug/mem_leak.php b/examples/debug/mem_leak.php
index ac161ba3..82159266 100644
--- a/examples/debug/mem_leak.php
+++ b/examples/debug/mem_leak.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function gen_random (int $n) {
     global $LAST;
     return( ($n * ($LAST = ($LAST * IA + IC) % IM)) / IM );
diff --git a/examples/error/unset-int-prop.php b/examples/error/unset-int-prop.php
index fca97d3b..e6a6e4a0 100644
--- a/examples/error/unset-int-prop.php
+++ b/examples/error/unset-int-prop.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class Test {
     public int $x = 100;
 
diff --git a/examples/error/unset-int-var.php b/examples/error/unset-int-var.php
index 3c68ff2b..48dbe269 100644
--- a/examples/error/unset-int-var.php
+++ b/examples/error/unset-int-var.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     $x = 100;
diff --git a/examples/high-precision.php b/examples/high-precision.php
index e7d6668d..34841d9b 100644
--- a/examples/high-precision.php
+++ b/examples/high-precision.php
@@ -1,7 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void
 {
     $integer = std::bigInt("123456789012345678901234567890");
diff --git a/examples/perf/class-static-prop.php b/examples/perf/class-static-prop.php
index 01854fa3..91afb34c 100644
--- a/examples/perf/class-static-prop.php
+++ b/examples/perf/class-static-prop.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class Foo {
     static public int $a;
     static public object $o;
@@ -34,4 +32,4 @@ function main(): void {
 //    isset_static(100000);
 //    static_prop_add(100000);
     static_prop_add_object(1000);
-}
\ No newline at end of file
+}
diff --git a/examples/perf/code.php b/examples/perf/code.php
index 25401163..79773876 100644
--- a/examples/perf/code.php
+++ b/examples/perf/code.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 const N = 1000_0000;
 const ROUNDS = 5;
 
diff --git a/examples/perf/empty_class_static_prop.php b/examples/perf/empty_class_static_prop.php
index b4fc583c..9be20194 100644
--- a/examples/perf/empty_class_static_prop.php
+++ b/examples/perf/empty_class_static_prop.php
@@ -1,9 +1,7 @@
 <?php
-use native_types;
 class Foo {
     static public int $a;
 }
-
 function main() {
     $s = microtime( true);
     $n = 1000_0000;
@@ -11,4 +9,4 @@ function main() {
         $x = empty(Foo::$a);
     }
     echo microtime( true) - $s, "\n";
-}
\ No newline at end of file
+}
diff --git a/examples/pi.php b/examples/pi.php
index d3de90dc..208660e2 100644
--- a/examples/pi.php
+++ b/examples/pi.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     ini_set("precision", 17);
diff --git a/examples/wasm-hello/src/WasiDemo.php b/examples/wasm-hello/src/WasiDemo.php
index 02e49324..d94f1c5d 100644
--- a/examples/wasm-hello/src/WasiDemo.php
+++ b/examples/wasm-hello/src/WasiDemo.php
@@ -1,8 +1,6 @@
 <?php
-
 declare(strict_types=1);
 
-use native_types;
 
 final class WasiDemo
 {
diff --git a/phpunit/code/assign-divide-by-zero.php b/phpunit/code/assign-divide-by-zero.php
index 81a41471..6deb8502 100644
--- a/phpunit/code/assign-divide-by-zero.php
+++ b/phpunit/code/assign-divide-by-zero.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {
diff --git a/phpunit/code/assign-modulo-by-zero.php b/phpunit/code/assign-modulo-by-zero.php
index 419cd48d..e9075c34 100644
--- a/phpunit/code/assign-modulo-by-zero.php
+++ b/phpunit/code/assign-modulo-by-zero.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {
diff --git a/phpunit/code/big-numeric/bigfloat-pow-operator.php b/phpunit/code/big-numeric/bigfloat-pow-operator.php
index 6b58bad0..f1fc60a8 100644
--- a/phpunit/code/big-numeric/bigfloat-pow-operator.php
+++ b/phpunit/code/big-numeric/bigfloat-pow-operator.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $bigfloat = std::bigFloat('2');
diff --git a/phpunit/code/big-numeric/decimal-pow-operator.php b/phpunit/code/big-numeric/decimal-pow-operator.php
index f4d63119..b3350959 100644
--- a/phpunit/code/big-numeric/decimal-pow-operator.php
+++ b/phpunit/code/big-numeric/decimal-pow-operator.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $decimal = std::decimal('2');
diff --git a/phpunit/code/big-numeric/mixed-big-comparison.php b/phpunit/code/big-numeric/mixed-big-comparison.php
index 6d8af4e2..42065f74 100644
--- a/phpunit/code/big-numeric/mixed-big-comparison.php
+++ b/phpunit/code/big-numeric/mixed-big-comparison.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $bigint = std::bigInt('2');
diff --git a/phpunit/code/bigfloat-unsupported-mod.php b/phpunit/code/bigfloat-unsupported-mod.php
index fac352a5..b303abe9 100644
--- a/phpunit/code/bigfloat-unsupported-mod.php
+++ b/phpunit/code/bigfloat-unsupported-mod.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigFloat("3.14");
diff --git a/phpunit/code/bigfloat-unsupported-shift.php b/phpunit/code/bigfloat-unsupported-shift.php
index 44f353f0..14104493 100644
--- a/phpunit/code/bigfloat-unsupported-shift.php
+++ b/phpunit/code/bigfloat-unsupported-shift.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigFloat("10.0");
diff --git a/phpunit/code/bigint-post-inc.php b/phpunit/code/bigint-post-inc.php
index 708ccfbf..11b36c8d 100644
--- a/phpunit/code/bigint-post-inc.php
+++ b/phpunit/code/bigint-post-inc.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigInt(100);
diff --git a/phpunit/code/bigint-pre-inc.php b/phpunit/code/bigint-pre-inc.php
index e67ab615..46bbf83d 100644
--- a/phpunit/code/bigint-pre-inc.php
+++ b/phpunit/code/bigint-pre-inc.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::bigInt(100);
diff --git a/phpunit/code/constant-overflow-native-add.php b/phpunit/code/constant-overflow-native-add.php
index 05257f77..f9a954ed 100644
--- a/phpunit/code/constant-overflow-native-add.php
+++ b/phpunit/code/constant-overflow-native-add.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-div-subtree.php b/phpunit/code/constant-overflow-native-div-subtree.php
index 7078d974..8d8d9f4d 100644
--- a/phpunit/code/constant-overflow-native-div-subtree.php
+++ b/phpunit/code/constant-overflow-native-div-subtree.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-div.php b/phpunit/code/constant-overflow-native-div.php
index 6202ef76..a3350501 100644
--- a/phpunit/code/constant-overflow-native-div.php
+++ b/phpunit/code/constant-overflow-native-div.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-mod.php b/phpunit/code/constant-overflow-native-mod.php
index 2fcb81ca..8357481e 100644
--- a/phpunit/code/constant-overflow-native-mod.php
+++ b/phpunit/code/constant-overflow-native-mod.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-mul.php b/phpunit/code/constant-overflow-native-mul.php
index cb395ea0..242e5dfc 100644
--- a/phpunit/code/constant-overflow-native-mul.php
+++ b/phpunit/code/constant-overflow-native-mul.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-neg.php b/phpunit/code/constant-overflow-native-neg.php
index 11ea319f..c67e2b6b 100644
--- a/phpunit/code/constant-overflow-native-neg.php
+++ b/phpunit/code/constant-overflow-native-neg.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-nested-add.php b/phpunit/code/constant-overflow-native-nested-add.php
index 07e58123..284bdfc8 100644
--- a/phpunit/code/constant-overflow-native-nested-add.php
+++ b/phpunit/code/constant-overflow-native-nested-add.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-nested-div.php b/phpunit/code/constant-overflow-native-nested-div.php
index 2e0d19e6..49695522 100644
--- a/phpunit/code/constant-overflow-native-nested-div.php
+++ b/phpunit/code/constant-overflow-native-nested-div.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-nested-mod.php b/phpunit/code/constant-overflow-native-nested-mod.php
index 15ef9045..cf97c890 100644
--- a/phpunit/code/constant-overflow-native-nested-mod.php
+++ b/phpunit/code/constant-overflow-native-nested-mod.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-nested-zero.php b/phpunit/code/constant-overflow-native-nested-zero.php
index 1fa2dae0..7639b3fc 100644
--- a/phpunit/code/constant-overflow-native-nested-zero.php
+++ b/phpunit/code/constant-overflow-native-nested-zero.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-nonconstant.php b/phpunit/code/constant-overflow-native-nonconstant.php
index 9e57e32b..c75da045 100644
--- a/phpunit/code/constant-overflow-native-nonconstant.php
+++ b/phpunit/code/constant-overflow-native-nonconstant.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function addToMaximum(int $value): int
 {
diff --git a/phpunit/code/constant-overflow-native-ok.php b/phpunit/code/constant-overflow-native-ok.php
index 3a920067..c811ee52 100644
--- a/phpunit/code/constant-overflow-native-ok.php
+++ b/phpunit/code/constant-overflow-native-ok.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-native-sub.php b/phpunit/code/constant-overflow-native-sub.php
index 65d0bf38..47bc6a75 100644
--- a/phpunit/code/constant-overflow-native-sub.php
+++ b/phpunit/code/constant-overflow-native-sub.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/constant-overflow-warning.php b/phpunit/code/constant-overflow-warning.php
index acc975d3..d293beae 100644
--- a/phpunit/code/constant-overflow-warning.php
+++ b/phpunit/code/constant-overflow-warning.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 declare(strict_types=1);
 
diff --git a/phpunit/code/control-flow/loop-switch-continue.php b/phpunit/code/control-flow/loop-switch-continue.php
index 44f7faf7..7dcb12bf 100644
--- a/phpunit/code/control-flow/loop-switch-continue.php
+++ b/phpunit/code/control-flow/loop-switch-continue.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function switch_continue_in_for(): void
 {
     for ($i = 0; $i < 2; $i++) {
diff --git a/phpunit/code/control-flow/standalone-switch-continue.php b/phpunit/code/control-flow/standalone-switch-continue.php
index 18583224..cd4a4d66 100644
--- a/phpunit/code/control-flow/standalone-switch-continue.php
+++ b/phpunit/code/control-flow/standalone-switch-continue.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function standalone_switch_continue(int $value): void
 {
     switch ($value) {
diff --git a/phpunit/code/decimal-pre-dec.php b/phpunit/code/decimal-pre-dec.php
index 3c8aa589..3c600d65 100644
--- a/phpunit/code/decimal-pre-dec.php
+++ b/phpunit/code/decimal-pre-dec.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("100");
diff --git a/phpunit/code/decimal-unsupported-bitand.php b/phpunit/code/decimal-unsupported-bitand.php
index 83484bb5..50387040 100644
--- a/phpunit/code/decimal-unsupported-bitand.php
+++ b/phpunit/code/decimal-unsupported-bitand.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("3.14");
diff --git a/phpunit/code/decimal-unsupported-bitor.php b/phpunit/code/decimal-unsupported-bitor.php
index 91178992..b58e3a65 100644
--- a/phpunit/code/decimal-unsupported-bitor.php
+++ b/phpunit/code/decimal-unsupported-bitor.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $a = std::decimal("100");
diff --git a/phpunit/code/divide-by-zero-any.php b/phpunit/code/divide-by-zero-any.php
new file mode 100644
index 00000000..f3c506a2
--- /dev/null
+++ b/phpunit/code/divide-by-zero-any.php
@@ -0,0 +1,7 @@
+<?php
+
+function divideByZeroAny(): void
+{
+    $value = std::any(10);
+    var_dump($value / 0);
+}
diff --git a/phpunit/code/divide-by-zero-int.php b/phpunit/code/divide-by-zero-int.php
index 5325c35a..de4fbd7e 100644
--- a/phpunit/code/divide-by-zero-int.php
+++ b/phpunit/code/divide-by-zero-int.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {
diff --git a/phpunit/code/divide-by-zero-string.php b/phpunit/code/divide-by-zero-string.php
index c280fdce..9f4c2947 100644
--- a/phpunit/code/divide-by-zero-string.php
+++ b/phpunit/code/divide-by-zero-string.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {
diff --git a/phpunit/code/dynamic-scalar-binary-operands.php b/phpunit/code/dynamic-scalar-binary-operands.php
index 0ab18432..b806b4d1 100644
--- a/phpunit/code/dynamic-scalar-binary-operands.php
+++ b/phpunit/code/dynamic-scalar-binary-operands.php
@@ -1,5 +1,7 @@
 <?php
 
+use varint_types;
+
 function recursivePhpInt(int $value): int
 {
     return $value < 2
diff --git a/phpunit/code/hot-path-codegen.php b/phpunit/code/hot-path-codegen.php
index 67b9bcbc..48c85f1a 100644
--- a/phpunit/code/hot-path-codegen.php
+++ b/phpunit/code/hot-path-codegen.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function hotPathTrace(string $value): string
 {
     return $value;
diff --git a/phpunit/code/local-literal-declaration-initializer-native.php b/phpunit/code/local-literal-declaration-initializer-varint.php
similarity index 74%
rename from phpunit/code/local-literal-declaration-initializer-native.php
rename to phpunit/code/local-literal-declaration-initializer-varint.php
index bb0061e5..ab85b92a 100644
--- a/phpunit/code/local-literal-declaration-initializer-native.php
+++ b/phpunit/code/local-literal-declaration-initializer-varint.php
@@ -1,8 +1,8 @@
 <?php
 
-use native_types;
+use varint_types;
 
-function localLiteralDeclarationInitializerNative(): void
+function localLiteralDeclarationInitializerVarInt(): void
 {
     $integer = 42;
     $negative = -7;
diff --git a/phpunit/code/local-literal-declaration-initializer.php b/phpunit/code/local-literal-declaration-initializer.php
index c2a0a5bc..35366148 100644
--- a/phpunit/code/local-literal-declaration-initializer.php
+++ b/phpunit/code/local-literal-declaration-initializer.php
@@ -8,6 +8,7 @@ function localLiteralDeclarationInitializer(): void
     $boolean = true;
     $string = 'hello';
     $nullValue = null;
+    $explicitAny = std::any(100);
 
     if ($boolean) {
         $nested = 9;
@@ -24,5 +25,6 @@ function localLiteralDeclarationInitializer(): void
         $nullValue,
         $nested,
         $computed,
+        $explicitAny,
     );
 }
diff --git a/phpunit/code/modulo-by-zero-int.php b/phpunit/code/modulo-by-zero-int.php
index 4c09f1a3..c7f7bda5 100644
--- a/phpunit/code/modulo-by-zero-int.php
+++ b/phpunit/code/modulo-by-zero-int.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function main(): void
 {
diff --git a/phpunit/code/native-bool-array-dim-write.php b/phpunit/code/native-bool-array-dim-write.php
index 8c92e316..670e572b 100644
--- a/phpunit/code/native-bool-array-dim-write.php
+++ b/phpunit/code/native-bool-array-dim-write.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = false;
diff --git a/phpunit/code/native-float-array-dim-write.php b/phpunit/code/native-float-array-dim-write.php
index 8dd36b99..c80297cc 100644
--- a/phpunit/code/native-float-array-dim-write.php
+++ b/phpunit/code/native-float-array-dim-write.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = 1.5;
diff --git a/phpunit/code/native-int-array-dim-write.php b/phpunit/code/native-int-array-dim-write.php
index c11d7994..2cd8c610 100644
--- a/phpunit/code/native-int-array-dim-write.php
+++ b/phpunit/code/native-int-array-dim-write.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main(): void
 {
     $value = 1;
diff --git a/phpunit/code/native-method-unset-keeps-optimization.php b/phpunit/code/native-method-unset-keeps-optimization.php
index 5229a247..a26322a9 100644
--- a/phpunit/code/native-method-unset-keeps-optimization.php
+++ b/phpunit/code/native-method-unset-keeps-optimization.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativeMethodUnsetKeepsOptimization
 {
     public int $value = 7;
diff --git a/phpunit/code/native-property-assign-op-class-const.php b/phpunit/code/native-property-assign-op-class-const.php
index 9676a0ac..c28ee39d 100644
--- a/phpunit/code/native-property-assign-op-class-const.php
+++ b/phpunit/code/native-property-assign-op-class-const.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyAssignOpClassConstBox
 {
     public int $flags = 7;
diff --git a/phpunit/code/native-property-assign-op-int.php b/phpunit/code/native-property-assign-op-int.php
index 9a60da62..c90c9f9a 100644
--- a/phpunit/code/native-property-assign-op-int.php
+++ b/phpunit/code/native-property-assign-op-int.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyAssignOpIntBox
 {
     public int $value = 1;
diff --git a/phpunit/code/native-property-full-name.php b/phpunit/code/native-property-full-name.php
index e954ccbb..05ca7f19 100644
--- a/phpunit/code/native-property-full-name.php
+++ b/phpunit/code/native-property-full-name.php
@@ -1,7 +1,5 @@
 <?php
-
 namespace NativePropSource {
-    use native_types;
 
     class Target
     {
@@ -12,7 +10,6 @@ namespace NativePropSource {
 }
 
 namespace NativePropSource\Target {
-    use native_types;
     use NativePropSource\Target;
 
     class Child extends Target
diff --git a/phpunit/code/native-property-private-other-class.php b/phpunit/code/native-property-private-other-class.php
index d75474f1..187e6ad0 100644
--- a/phpunit/code/native-property-private-other-class.php
+++ b/phpunit/code/native-property-private-other-class.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePrivateOwner
 {
     private int $value = 1;
diff --git a/phpunit/code/native-property-protected-unrelated-class.php b/phpunit/code/native-property-protected-unrelated-class.php
index 93a32149..3eaa477f 100644
--- a/phpunit/code/native-property-protected-unrelated-class.php
+++ b/phpunit/code/native-property-protected-unrelated-class.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativeProtectedOwner
 {
     protected int $value = 1;
diff --git a/phpunit/code/native-property-static-type-mismatch.php b/phpunit/code/native-property-static-type-mismatch.php
index 3f1e5921..3a3cd56e 100644
--- a/phpunit/code/native-property-static-type-mismatch.php
+++ b/phpunit/code/native-property-static-type-mismatch.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyStaticTypeMismatchBox
 {
     public int $value = 0;
diff --git a/phpunit/code/native-property-this-write-conversion.php b/phpunit/code/native-property-this-write-conversion.php
index 2e889bb7..35f15140 100644
--- a/phpunit/code/native-property-this-write-conversion.php
+++ b/phpunit/code/native-property-this-write-conversion.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyThisWriteConversionBox
 {
     public int $value = 0;
diff --git a/phpunit/code/native-property-unset-disables-hoist.php b/phpunit/code/native-property-unset-disables-hoist.php
index 54fe4487..6bc260ef 100644
--- a/phpunit/code/native-property-unset-disables-hoist.php
+++ b/phpunit/code/native-property-unset-disables-hoist.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NativePropertyUnsetDisablesHoist
 {
     public int $value = 7;
diff --git a/phpunit/code/native-property-write-conversion.php b/phpunit/code/native-property-write-conversion.php
index 6cff3f53..eb9184fc 100644
--- a/phpunit/code/native-property-write-conversion.php
+++ b/phpunit/code/native-property-write-conversion.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class NativePropertyWriteConversionBox
 {
     public int $value = 0;
diff --git a/phpunit/code/native-scalar-binary-operands.php b/phpunit/code/native-scalar-binary-operands.php
index f82e4fa7..c3eeebcd 100644
--- a/phpunit/code/native-scalar-binary-operands.php
+++ b/phpunit/code/native-scalar-binary-operands.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 function recursiveNativeInt(int $value): int
 {
     return $value < 2
diff --git a/phpunit/code/nullsafe-nested-private-property.php b/phpunit/code/nullsafe-nested-private-property.php
index ca30b8be..f7a3d022 100644
--- a/phpunit/code/nullsafe-nested-private-property.php
+++ b/phpunit/code/nullsafe-nested-private-property.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NullsafeNestedOwner
 {
     public NullsafeNestedChild $child;
diff --git a/phpunit/code/nullsafe-private-property.php b/phpunit/code/nullsafe-private-property.php
index 4ed46c0e..6214e3b9 100644
--- a/phpunit/code/nullsafe-private-property.php
+++ b/phpunit/code/nullsafe-private-property.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class NullsafePrivateOwner
 {
     private int $value = 1;
diff --git a/phpunit/code/object-prop-subclass-mismatch.php b/phpunit/code/object-prop-subclass-mismatch.php
index 07fe2086..471437b7 100644
--- a/phpunit/code/object-prop-subclass-mismatch.php
+++ b/phpunit/code/object-prop-subclass-mismatch.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 class TypedObjectPropBase
 {
 }
diff --git a/phpunit/code/php-int-max-fold-global.php b/phpunit/code/php-int-max-fold-global.php
index 5c4f8a27..7321b410 100644
--- a/phpunit/code/php-int-max-fold-global.php
+++ b/phpunit/code/php-int-max-fold-global.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function lowercaseIsRuntime()
 {
diff --git a/phpunit/code/php-int-max-fold-namespace.php b/phpunit/code/php-int-max-fold-namespace.php
index 5abe3d15..8503d0cd 100644
--- a/phpunit/code/php-int-max-fold-namespace.php
+++ b/phpunit/code/php-int-max-fold-namespace.php
@@ -2,6 +2,8 @@
 
 namespace FoldNs;
 
+use varint_types;
+
 const PHP_INT_MAX = 5;
 
 function shadowedFold(): int
diff --git a/phpunit/code/re-assign-array-to-bool.php b/phpunit/code/re-assign-array-to-bool.php
index e15cfe71..301fd81e 100644
--- a/phpunit/code/re-assign-array-to-bool.php
+++ b/phpunit/code/re-assign-array-to-bool.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;
diff --git a/phpunit/code/re-assign-array-to-float.php b/phpunit/code/re-assign-array-to-float.php
index 13e3c426..9a6d0193 100644
--- a/phpunit/code/re-assign-array-to-float.php
+++ b/phpunit/code/re-assign-array-to-float.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;
diff --git a/phpunit/code/re-assign-array-to-int.php b/phpunit/code/re-assign-array-to-int.php
index 48689227..3c4c117a 100644
--- a/phpunit/code/re-assign-array-to-int.php
+++ b/phpunit/code/re-assign-array-to-int.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;
diff --git a/phpunit/code/re-assign-array-to-obj.php b/phpunit/code/re-assign-array-to-obj.php
index f4060f37..032a882d 100644
--- a/phpunit/code/re-assign-array-to-obj.php
+++ b/phpunit/code/re-assign-array-to-obj.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();
diff --git a/phpunit/code/re-assign-bool-to-array.php b/phpunit/code/re-assign-bool-to-array.php
index ed42fc0c..5e01cb19 100644
--- a/phpunit/code/re-assign-bool-to-array.php
+++ b/phpunit/code/re-assign-bool-to-array.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];
diff --git a/phpunit/code/re-assign-bool-to-obj.php b/phpunit/code/re-assign-bool-to-obj.php
index e53b64d7..b508cf89 100644
--- a/phpunit/code/re-assign-bool-to-obj.php
+++ b/phpunit/code/re-assign-bool-to-obj.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();
diff --git a/phpunit/code/re-assign-float-to-array.php b/phpunit/code/re-assign-float-to-array.php
index a9e347f1..b5b55473 100644
--- a/phpunit/code/re-assign-float-to-array.php
+++ b/phpunit/code/re-assign-float-to-array.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];
diff --git a/phpunit/code/re-assign-float-to-obj.php b/phpunit/code/re-assign-float-to-obj.php
index 8f5a88a9..dae40160 100644
--- a/phpunit/code/re-assign-float-to-obj.php
+++ b/phpunit/code/re-assign-float-to-obj.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();
diff --git a/phpunit/code/re-assign-int-to-array.php b/phpunit/code/re-assign-int-to-array.php
index 7ed623d0..b425b6de 100644
--- a/phpunit/code/re-assign-int-to-array.php
+++ b/phpunit/code/re-assign-int-to-array.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];
diff --git a/phpunit/code/re-assign-int-to-obj.php b/phpunit/code/re-assign-int-to-obj.php
index 7ec60879..afac31e1 100644
--- a/phpunit/code/re-assign-int-to-obj.php
+++ b/phpunit/code/re-assign-int-to-obj.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $obj = new stdClass();
diff --git a/phpunit/code/re-assign-obj-to-array.php b/phpunit/code/re-assign-obj-to-array.php
index d5b8065a..c9cfd669 100644
--- a/phpunit/code/re-assign-obj-to-array.php
+++ b/phpunit/code/re-assign-obj-to-array.php
@@ -1,6 +1,4 @@
 <?php
-use native_types;
-
 function main()
 {
     $obj = [];
diff --git a/phpunit/code/re-assign-obj-to-bool.php b/phpunit/code/re-assign-obj-to-bool.php
index 74142d8e..c32c8e0a 100644
--- a/phpunit/code/re-assign-obj-to-bool.php
+++ b/phpunit/code/re-assign-obj-to-bool.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;
diff --git a/phpunit/code/re-assign-obj-to-float.php b/phpunit/code/re-assign-obj-to-float.php
index 39c53ada..bb4c7341 100644
--- a/phpunit/code/re-assign-obj-to-float.php
+++ b/phpunit/code/re-assign-obj-to-float.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;
diff --git a/phpunit/code/re-assign-obj-to-int.php b/phpunit/code/re-assign-obj-to-int.php
index 9f0c6db4..97f8bbcd 100644
--- a/phpunit/code/re-assign-obj-to-int.php
+++ b/phpunit/code/re-assign-obj-to-int.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;
diff --git a/phpunit/code/re-assign-obj-to-str.php b/phpunit/code/re-assign-obj-to-str.php
index 538f65c1..25a71a7b 100644
--- a/phpunit/code/re-assign-obj-to-str.php
+++ b/phpunit/code/re-assign-obj-to-str.php
@@ -1,6 +1,5 @@
 <?php
 declare(strict_types=1);
-use native_types;
 function main()
 {
     $x = "hello";
diff --git a/phpunit/code/re-assign-str-to-array.php b/phpunit/code/re-assign-str-to-array.php
index b9e43730..695506a7 100644
--- a/phpunit/code/re-assign-str-to-array.php
+++ b/phpunit/code/re-assign-str-to-array.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = [1, 2];
diff --git a/phpunit/code/re-assign-str-to-bool.php b/phpunit/code/re-assign-str-to-bool.php
index 9f60be78..d3beac00 100644
--- a/phpunit/code/re-assign-str-to-bool.php
+++ b/phpunit/code/re-assign-str-to-bool.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = true;
diff --git a/phpunit/code/re-assign-str-to-float.php b/phpunit/code/re-assign-str-to-float.php
index a9dbfe1c..2c29f9ff 100644
--- a/phpunit/code/re-assign-str-to-float.php
+++ b/phpunit/code/re-assign-str-to-float.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 3.14;
diff --git a/phpunit/code/re-assign-str-to-int.php b/phpunit/code/re-assign-str-to-int.php
index 272ab966..687b824d 100644
--- a/phpunit/code/re-assign-str-to-int.php
+++ b/phpunit/code/re-assign-str-to-int.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $x = 42;
diff --git a/phpunit/code/readonly-property-no-native-ref.php b/phpunit/code/readonly-property-no-native-ref.php
index b07145f9..00ba9077 100644
--- a/phpunit/code/readonly-property-no-native-ref.php
+++ b/phpunit/code/readonly-property-no-native-ref.php
@@ -1,7 +1,5 @@
 <?php
 
-use native_types;
-
 class ReadonlyPropertyNoNativeRef
 {
     public readonly int $integer;
diff --git a/phpunit/code/removed-native-types.php b/phpunit/code/removed-native-types.php
new file mode 100644
index 00000000..bc77cc9d
--- /dev/null
+++ b/phpunit/code/removed-native-types.php
@@ -0,0 +1,7 @@
+<?php
+
+use native_types;
+
+function removedNativeTypes(): void
+{
+}
diff --git a/phpunit/code/shift-boundary-native-neg-left.php b/phpunit/code/shift-boundary-native-neg-left.php
index 7750dd8e..13f897d8 100644
--- a/phpunit/code/shift-boundary-native-neg-left.php
+++ b/phpunit/code/shift-boundary-native-neg-left.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-neg-right.php b/phpunit/code/shift-boundary-native-neg-right.php
index 4bc22055..46562f44 100644
--- a/phpunit/code/shift-boundary-native-neg-right.php
+++ b/phpunit/code/shift-boundary-native-neg-right.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-negative.php b/phpunit/code/shift-boundary-native-negative.php
index e6de2d2b..873a47a2 100644
--- a/phpunit/code/shift-boundary-native-negative.php
+++ b/phpunit/code/shift-boundary-native-negative.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-nested-neg-right.php b/phpunit/code/shift-boundary-native-nested-neg-right.php
index faa3ebc6..9f86e5c2 100644
--- a/phpunit/code/shift-boundary-native-nested-neg-right.php
+++ b/phpunit/code/shift-boundary-native-nested-neg-right.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-nested-overflow.php b/phpunit/code/shift-boundary-native-nested-overflow.php
index 82f63c6d..239c84f9 100644
--- a/phpunit/code/shift-boundary-native-nested-overflow.php
+++ b/phpunit/code/shift-boundary-native-nested-overflow.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-ok.php b/phpunit/code/shift-boundary-native-ok.php
index 2547a6ca..a3638f79 100644
--- a/phpunit/code/shift-boundary-native-ok.php
+++ b/phpunit/code/shift-boundary-native-ok.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-overflow.php b/phpunit/code/shift-boundary-native-overflow.php
index 08ea1c60..698d08cb 100644
--- a/phpunit/code/shift-boundary-native-overflow.php
+++ b/phpunit/code/shift-boundary-native-overflow.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-sign-bit.php b/phpunit/code/shift-boundary-native-sign-bit.php
index 0ac507ec..ea80b5b5 100644
--- a/phpunit/code/shift-boundary-native-sign-bit.php
+++ b/phpunit/code/shift-boundary-native-sign-bit.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-native-wrapped-overflow.php b/phpunit/code/shift-boundary-native-wrapped-overflow.php
index 06cb68ab..844e6f5e 100644
--- a/phpunit/code/shift-boundary-native-wrapped-overflow.php
+++ b/phpunit/code/shift-boundary-native-wrapped-overflow.php
@@ -1,7 +1,5 @@
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 function main(): void
 {
diff --git a/phpunit/code/shift-boundary-warning.php b/phpunit/code/shift-boundary-warning.php
index 794c75f0..b9df192a 100644
--- a/phpunit/code/shift-boundary-warning.php
+++ b/phpunit/code/shift-boundary-warning.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 declare(strict_types=1);
 
diff --git a/phpunit/code/typed-scalar-arithmetic-codegen.php b/phpunit/code/typed-scalar-arithmetic-codegen.php
index 87f0a9da..afb44695 100644
--- a/phpunit/code/typed-scalar-arithmetic-codegen.php
+++ b/phpunit/code/typed-scalar-arithmetic-codegen.php
@@ -1,4 +1,5 @@
 <?php
+use varint_types;
 
 function divTypedInts(int $a, int $b): float
 {
diff --git a/phpunit/code/universal-method-int-undefined.php b/phpunit/code/universal-method-int-undefined.php
index bc8a3c58..aa7826f2 100644
--- a/phpunit/code/universal-method-int-undefined.php
+++ b/phpunit/code/universal-method-int-undefined.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $a = 100;
diff --git a/phpunit/code/universal-method-int-wrong-args.php b/phpunit/code/universal-method-int-wrong-args.php
index 8995fc26..b5f297a2 100644
--- a/phpunit/code/universal-method-int-wrong-args.php
+++ b/phpunit/code/universal-method-int-wrong-args.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     $a = 100;
diff --git a/phpunit/code/universal-method-literal-call.php b/phpunit/code/universal-method-literal-call.php
index d638506f..ffa6adcd 100644
--- a/phpunit/code/universal-method-literal-call.php
+++ b/phpunit/code/universal-method-literal-call.php
@@ -1,5 +1,4 @@
 <?php
-use native_types;
 function main()
 {
     (100)->add(99);
diff --git a/phpunit/code/varint-types-case-insensitive.php b/phpunit/code/varint-types-case-insensitive.php
new file mode 100644
index 00000000..b2d786ee
--- /dev/null
+++ b/phpunit/code/varint-types-case-insensitive.php
@@ -0,0 +1,11 @@
+<?php
+
+use VaRiNt_TyPeS;
+
+function varIntTypesCaseInsensitive(): void
+{
+    $integer = 42;
+    $floating = 1.5;
+    $boolean = true;
+    var_dump($integer, $floating, $boolean);
+}
diff --git a/phpunit/src/ClassExistsTraitFoldTest.php b/phpunit/src/ClassExistsTraitFoldTest.php
index 7f5ce845..335647dd 100644
--- a/phpunit/src/ClassExistsTraitFoldTest.php
+++ b/phpunit/src/ClassExistsTraitFoldTest.php
@@ -24,7 +24,7 @@ class ClassExistsTraitFoldTest extends TestCase
         // The trait is known at compile time, so the call is still folded -
         // just to the answer PHP gives, which is false for a trait.
         self::assertStringNotContainsString('php::fn::class_exists(', $cpp);
-        self::assertStringContainsString('= false;', $cpp);
+        self::assertStringContainsString('= php::toBool(false);', $cpp);
     }
 
     public function testClassAndEnumNamesStillFoldToTrue(): void
@@ -32,7 +32,7 @@ class ClassExistsTraitFoldTest extends TestCase
         $cpp = $this->compileToCpp('class-exists-class-and-enum.php');
 
         self::assertStringNotContainsString('php::fn::class_exists(', $cpp);
-        self::assertStringNotContainsString('= false;', $cpp);
+        self::assertStringNotContainsString('= php::toBool(false);', $cpp);
     }
 
     public function testExplicitAutoloadArgumentUsesNormalCallPath(): void
diff --git a/phpunit/src/ConversionArityTest.php b/phpunit/src/ConversionArityTest.php
index 885e0e62..a399ddb9 100644
--- a/phpunit/src/ConversionArityTest.php
+++ b/phpunit/src/ConversionArityTest.php
@@ -23,7 +23,7 @@ class ConversionArityTest extends TestCase
 
         // The Native cast carries no base, so both calls must keep the second
         // argument by going through the dynamic path.
-        self::assertStringNotContainsString('php::toInt(', $cpp);
+        self::assertSame(2, substr_count($cpp, 'php::call(get_persistent_func(PersistentFuncId{1}'));
         self::assertSame(2, substr_count($cpp, '16L'));
     }
 
@@ -33,10 +33,10 @@ class ConversionArityTest extends TestCase
 
         // An unpacked argument is one Node\Arg whatever its runtime arity is,
         // so the array itself must never be handed to a Native cast.
-        self::assertStringNotContainsString('php::toInt(', $cpp);
-        self::assertStringNotContainsString('php::toString(', $cpp);
-        self::assertStringNotContainsString('php::toFloat(', $cpp);
-        self::assertStringNotContainsString('php::toBool(', $cpp);
+        self::assertStringNotContainsString('php::fn::intval(', $cpp);
+        self::assertStringNotContainsString('php::fn::strval(', $cpp);
+        self::assertStringNotContainsString('php::fn::floatval(', $cpp);
+        self::assertStringNotContainsString('php::fn::boolval(', $cpp);
 
         // Five full unpacks plus the partial intval('ff', ...[16]).
         self::assertSame(6, substr_count($cpp, 'appendUnpacked('));
diff --git a/phpunit/src/CtypeOptimizerTest.php b/phpunit/src/CtypeOptimizerTest.php
index b680b273..db8b07ed 100644
--- a/phpunit/src/CtypeOptimizerTest.php
+++ b/phpunit/src/CtypeOptimizerTest.php
@@ -34,6 +34,9 @@ final class CtypeOptimizerTest extends BaseTest
         }
         self::assertStringNotContainsString('get_persistent_func', $code);
         self::assertStringNotContainsString('php::call(', $code);
-        self::assertStringContainsString('result = php::fn::ctype_alnum(_php__var__char);', $code);
+        self::assertStringContainsString(
+            'result = php::toBool(php::fn::ctype_alnum(_php__var__char));',
+            $code,
+        );
     }
 }
diff --git a/phpunit/src/EvalOrderSideEffectsCodegenTest.php b/phpunit/src/EvalOrderSideEffectsCodegenTest.php
index 69dac7ea..4eef98e8 100644
--- a/phpunit/src/EvalOrderSideEffectsCodegenTest.php
+++ b/phpunit/src/EvalOrderSideEffectsCodegenTest.php
@@ -19,7 +19,7 @@ final class EvalOrderSideEffectsCodegenTest extends \BaseTest
         $body = $this->extractFunctionBody($code, 'php_callargorder()');
 
         self::assertMatchesRegularExpression(
-            '/(tmp_var_\d+) = j;\s*\n\s*(tmp_var_\d+) = j = 5L{1,2};/',
+            '/(tmp_var_\d+) = php::toInt\(j\);\s*\n\s*(tmp_var_\d+) = php::toInt\(j = php::toInt\(5L{1,2}\)\);/',
             $body,
             'the old value of $j must be captured before $j = 5 executes',
         );
@@ -36,7 +36,7 @@ final class EvalOrderSideEffectsCodegenTest extends \BaseTest
         $body = $this->extractFunctionBody($code, 'php_concatorder()');
 
         self::assertMatchesRegularExpression(
-            '/(tmp_var_\d+) = m;\s*\n\s*(tmp_var_\d+) = m = 9L{1,2};/',
+            '/(tmp_var_\d+) = php::toInt\(m\);\s*\n\s*(tmp_var_\d+) = php::toInt\(m = php::toInt\(9L{1,2}\)\);/',
             $body,
             'the old value of $m must be captured before $m = 9 executes',
         );
@@ -53,7 +53,7 @@ final class EvalOrderSideEffectsCodegenTest extends \BaseTest
         $body = $this->extractFunctionBody($code, 'php_castwrappedcallargorder()');
 
         self::assertMatchesRegularExpression(
-            '/(tmp_var_\d+) = i;\s*\n\s*(tmp_var_\d+) = php::toInt\(i = 5L{1,2}\);/',
+            '/(tmp_var_\d+) = php::toInt\(i\);\s*\n\s*(tmp_var_\d+) = php::toInt\(i = php::toInt\(5L{1,2}\)\);/',
             $body,
             'the old value of $i must be captured before the cast-wrapped $i = 5 executes',
         );
@@ -70,7 +70,7 @@ final class EvalOrderSideEffectsCodegenTest extends \BaseTest
         $body = $this->extractFunctionBody($code, 'php_notwrappedcallargorder()');
 
         self::assertMatchesRegularExpression(
-            '/(tmp_var_\d+) = k;\s*\n\s*(tmp_var_\d+) = !\(php::toBool\(k = 0L{1,2}\)\);/',
+            '/(tmp_var_\d+) = php::toInt\(k\);\s*\n\s*(tmp_var_\d+) = php::toBool\(!\(php::toBool\(k = php::toInt\(0L{1,2}\)\)\)\);/',
             $body,
             'the old value of $k must be captured before the negated $k = 0 executes',
         );
@@ -89,10 +89,10 @@ final class EvalOrderSideEffectsCodegenTest extends \BaseTest
         // Zend reads the CV when the ADD executes, i.e. after the nested
         // assignment; the direct read of k matches that and must stay.
         self::assertMatchesRegularExpression(
-            '/(tmp_var_\d+) = k = 5L{1,2};\s*\n[^\n]*\(\(k\) \+ \(\1\)\)/',
+            '/(tmp_var_\d+) = php::toInt\(k = php::toInt\(5L{1,2}\)\);\s*\n[^\n]*\(\(k\) \+ \(\1\)\)/',
             $body,
         );
-        self::assertStringNotContainsString('= k;', $body);
+        self::assertStringNotContainsString('= php::toInt(k);', $body);
     }
 
     private function extractFunctionBody(string $code, string $marker): string
diff --git a/phpunit/src/FuncCallOptimizerTest.php b/phpunit/src/FuncCallOptimizerTest.php
index 10de1f87..6002f225 100644
--- a/phpunit/src/FuncCallOptimizerTest.php
+++ b/phpunit/src/FuncCallOptimizerTest.php
@@ -27,8 +27,8 @@ final class FuncCallOptimizerTest extends BaseTest
         self::assertStringContainsString('php_optimizertypedint()', $code);
         self::assertStringContainsString('php_optimizertypedfloat()', $code);
         self::assertStringContainsString('php_optimizerdynamicbool()', $code);
-        self::assertMatchesRegularExpression('/php_optimizertypedbool\(\);\s*php::fn::in_array/', $code);
-        self::assertMatchesRegularExpression('/php_optimizertypedint\(\);\s*php::call/', $code);
+        self::assertMatchesRegularExpression('/php::toBool\(php_optimizertypedbool\(\)\);\s*php::fn::in_array/', $code);
+        self::assertMatchesRegularExpression('/php::toInt\(php_optimizertypedint\(\)\);\s*php::call/', $code);
         self::assertMatchesRegularExpression('/php_optimizerdynamicbool\(\);\s*php::call/', $code);
         self::assertStringContainsString('php::fn::hypot(php::toFloat(', $code);
         self::assertStringContainsString('php::VarList{php::null}', $code);
diff --git a/phpunit/src/FuncCallOptimizerUnpackTest.php b/phpunit/src/FuncCallOptimizerUnpackTest.php
index f366b07f..e0ef08a2 100644
--- a/phpunit/src/FuncCallOptimizerUnpackTest.php
+++ b/phpunit/src/FuncCallOptimizerUnpackTest.php
@@ -29,7 +29,6 @@ class FuncCallOptimizerUnpackTest extends TestCase
         $cpp = file_get_contents($compiler->convertFile($source));
 
         self::assertSame(5, substr_count($cpp, '.appendUnpacked('));
-        self::assertStringNotContainsString('php::toInt(', $cpp);
         self::assertStringNotContainsString('php::fn::round(', $cpp);
         self::assertStringNotContainsString('php::fn::array_keys(', $cpp);
     }
diff --git a/phpunit/src/GeneratedCodeIndentationTest.php b/phpunit/src/GeneratedCodeIndentationTest.php
index d85535c9..0723a7ed 100644
--- a/phpunit/src/GeneratedCodeIndentationTest.php
+++ b/phpunit/src/GeneratedCodeIndentationTest.php
@@ -41,7 +41,7 @@ class GeneratedCodeIndentationTest extends \PHPUnit\Framework\TestCase
             $code,
         );
         $this->assertStringContainsString(
-            "\tphp::Var value = 1L;\n\n\treturn php::null;\n}",
+            "\tphp::Int value = php::toInt(1L);\n\n\treturn php::null;\n}",
             $code,
         );
         $this->assertStringNotContainsString('return php::null;}', $code);
diff --git a/phpunit/src/LocalVariableInitializerTest.php b/phpunit/src/LocalVariableInitializerTest.php
index ec647869..23a2cead 100644
--- a/phpunit/src/LocalVariableInitializerTest.php
+++ b/phpunit/src/LocalVariableInitializerTest.php
@@ -17,40 +17,43 @@ final class LocalVariableInitializerTest extends \BaseTest
         $code = file_get_contents($generated);
 
         self::assertIsString($code);
-        self::assertStringContainsString('php::Var integer = 42L;', $code);
-        self::assertStringContainsString('php::Var negative = -7L;', $code);
-        self::assertStringContainsString('php::Var floating = 1.25;', $code);
-        self::assertStringContainsString('php::Var boolean = true;', $code);
+        self::assertStringContainsString('php::Int integer = php::toInt(42L);', $code);
+        self::assertStringContainsString('php::Int negative = php::toInt(-7L);', $code);
+        self::assertStringContainsString('php::Float floating = php::toFloat(1.25);', $code);
+        self::assertStringContainsString('php::Bool boolean = php::toBool(true);', $code);
         self::assertMatchesRegularExpression('/php::Str string = get_str\(\d+\);/', $code);
         self::assertStringContainsString('php::Var nullValue = php::null;', $code);
+        self::assertStringContainsString('php::Var explicitAny;', $code);
+        self::assertStringContainsString('explicitAny = 100L;', $code);
 
-        self::assertStringContainsString('php::Var nested;', $code);
-        self::assertStringContainsString('nested = 9L;', $code);
-        self::assertStringContainsString('php::Var computed;', $code);
-        self::assertStringContainsString('computed = ((40L) + (2L));', $code);
+        self::assertStringContainsString('php::Int nested = 0;', $code);
+        self::assertStringContainsString('nested = php::toInt(9L);', $code);
+        self::assertStringContainsString('php::Int computed = 0;', $code);
+        self::assertStringContainsString('computed = php::toInt(((40L) + (2L)));', $code);
 
         $afterDeclaration = substr(
             $code,
-            strpos($code, 'php::Var integer = 42L;') + strlen('php::Var integer = 42L;'),
+            strpos($code, 'php::Int integer = php::toInt(42L);')
+                + strlen('php::Int integer = php::toInt(42L);'),
         );
-        self::assertStringNotContainsString('integer = 42L;', $afterDeclaration);
+        self::assertStringNotContainsString('integer = php::toInt(42L);', $afterDeclaration);
     }
 
-    public function testNativeScalarLiteralsInitializeNativeDeclarations(): void
+    public function testVarIntModeBoxesOnlyIntegerLiterals(): void
     {
         global $translator;
 
         $compiler = CompilerTest::create(TYPEPHP_ROOT_PATH);
         $translator = $compiler;
-        $source = TYPEPHP_ROOT_PATH . '/phpunit/code/local-literal-declaration-initializer-native.php';
+        $source = TYPEPHP_ROOT_PATH . '/phpunit/code/local-literal-declaration-initializer-varint.php';
         $compiler->addFiles([$source]);
         $compiler->prepareFile($source);
         $generated = $compiler->convertFile($source);
         $code = file_get_contents($generated);
 
         self::assertIsString($code);
-        self::assertStringContainsString('php::Int integer = php::toInt(42L);', $code);
-        self::assertStringContainsString('php::Int negative = php::toInt(-7L);', $code);
+        self::assertStringContainsString('php::Var integer = 42L;', $code);
+        self::assertStringContainsString('php::Var negative = -7L;', $code);
         self::assertStringContainsString('php::Float floating = php::toFloat(1.25);', $code);
         self::assertStringContainsString('php::Bool boolean = php::toBool(true);', $code);
         self::assertMatchesRegularExpression('/php::Str string = get_str\(\d+\);/', $code);
@@ -79,10 +82,10 @@ final class LocalVariableInitializerTest extends \BaseTest
             $code,
         );
         self::assertStringContainsString(
-            'php::Var namespaced = _const_var_LocalConstantInitializer__Consumer__ENABLED;',
+            'php::Bool namespaced = php::toBool(_const_var_LocalConstantInitializer__Consumer__ENABLED);',
             $code,
         );
-        self::assertStringContainsString('php::Var internal = ZEND_LONG_MAX;', $code);
+        self::assertStringContainsString('php::Int internal = php::toInt(ZEND_LONG_MAX);', $code);
 
         self::assertStringContainsString('php::Var runtime;', $code);
         self::assertStringContainsString('runtime = php::constant(', $code);
diff --git a/phpunit/src/LoopControlTest.php b/phpunit/src/LoopControlTest.php
index 0621967f..ba7da8d2 100644
--- a/phpunit/src/LoopControlTest.php
+++ b/phpunit/src/LoopControlTest.php
@@ -54,8 +54,8 @@ class LoopControlTest extends \BaseTest
         $this->assertMatchesRegularExpression('/\.attr\([^)]+\)[^;]*--/', $cpp);
 
         // static-property postfix must NOT be rewritten
-        $this->assertMatchesRegularExpression('/_typephp_static_property_\d+\(\)\+\+/', $cpp);
-        $this->assertMatchesRegularExpression('/_typephp_static_property_\d+\(\)--/', $cpp);
+        $this->assertMatchesRegularExpression('/_typephp_static_property_\d+\(\)\.direct_ptr\(\)\)\+\+/', $cpp);
+        $this->assertMatchesRegularExpression('/_typephp_static_property_\d+\(\)\.direct_ptr\(\)\)--/', $cpp);
 
         // array-element postfix must NOT be rewritten
         $this->assertMatchesRegularExpression('/\.item\([^)]+\)[^;]*\+\+/', $cpp);
diff --git a/phpunit/src/OperatorTest.php b/phpunit/src/OperatorTest.php
index 82f59dfe..c37b9c89 100644
--- a/phpunit/src/OperatorTest.php
+++ b/phpunit/src/OperatorTest.php
@@ -57,10 +57,9 @@ class OperatorTest extends \BaseTest
     }
 
     /**
-     * A literal zero divisor is valid PHP: it raises a catchable
-     * DivisionByZeroError only when the statement executes, so it must
-     * compile (with a warning) and defer to the runtime error, exactly like
-     * the already-accepted `1 % (1 - 1)` and `10 / ZERO` spellings.
+     * varint_types preserves PHP's catchable integer division errors. Native
+     * float storage remains the default and rejects a statically known zero
+     * divisor instead of emitting C++ infinity/NaN behavior.
      */
     public function testLiteralIntDivideByZeroCompilesToRuntimeError(): void
     {
@@ -68,10 +67,20 @@ class OperatorTest extends \BaseTest
         $this->assertMatchesRegularExpression('/\(\(php::Var\(10L{1,2}\)\) \/ \(php::Var\(0L{1,2}\)\)\)/', $cpp);
     }
 
-    public function testLiteralFloatDivideByZeroCompilesToRuntimeError(): void
+    public function testNativeFloatLiteralDivideByZeroIsRejected(): void
     {
-        $cpp = $this->compileToCpp('divide-by-zero-float.php');
-        $this->assertStringContainsString('((php::Var(1.0)) / (php::Var(0.0)))', $cpp);
+        $this->expectException(\TypePhp\Exception\TestError::class);
+        $this->expectExceptionMessage('Cannot divide or modulo by zero');
+        $this->compileToCpp('divide-by-zero-float.php');
+    }
+
+    public function testExplicitAnyIntegerKeepsRuntimeDivisionErrorInDefaultMode(): void
+    {
+        $cpp = $this->compileToCpp('divide-by-zero-any.php');
+        $this->assertMatchesRegularExpression(
+            '/\(\(php::Var\(value\)\) \/ \(php::Var\(0L{1,2}\)\)\)/',
+            $cpp,
+        );
     }
 
     public function testLiteralStringDivideByZeroCompilesToRuntimeError(): void
diff --git a/phpunit/src/VarIntTypesTest.php b/phpunit/src/VarIntTypesTest.php
new file mode 100644
index 00000000..f8334457
--- /dev/null
+++ b/phpunit/src/VarIntTypesTest.php
@@ -0,0 +1,71 @@
+<?php
+
+use TypePhp\CompilerTest;
+use TypePhp\Exception\TestError;
+
+final class VarIntTypesTest extends BaseTest
+{
+    public function testRemovedNativeTypesDirectiveHasStableMigrationDiagnostic(): void
+    {
+        $this->expectException(TestError::class);
+        $this->expectExceptionMessage(
+            '`use native_types` has been removed; native scalar types are now the default',
+        );
+
+        $compiler = $this->createCompiler();
+        $source = TYPEPHP_ROOT_PATH . '/phpunit/code/removed-native-types.php';
+        $compiler->addFiles([$source]);
+        $compiler->prepareFile($source);
+    }
+
+    public function testVarIntTypesDirectiveIsCaseInsensitiveAndOnlyBoxesIntegers(): void
+    {
+        $code = $this->compileSource(
+            $this->createCompiler(),
+            TYPEPHP_ROOT_PATH . '/phpunit/code/varint-types-case-insensitive.php',
+        );
+
+        self::assertStringContainsString('php::Var integer = 42L;', $code);
+        self::assertStringContainsString('php::Float floating = php::toFloat(1.5);', $code);
+        self::assertStringContainsString('php::Bool boolean = php::toBool(true);', $code);
+    }
+
+    public function testVarIntTypesModeDoesNotLeakIntoTheNextFile(): void
+    {
+        $compiler = $this->createCompiler();
+        $varIntSource = TYPEPHP_ROOT_PATH . '/phpunit/code/local-literal-declaration-initializer-varint.php';
+        $defaultSource = TYPEPHP_ROOT_PATH . '/phpunit/code/local-literal-declaration-initializer.php';
+        $compiler->addFiles([$varIntSource, $defaultSource]);
+
+        $compiler->prepareFile($varIntSource);
+        $compiler->prepareFile($defaultSource);
+        $this->compilePrepared($compiler, $varIntSource);
+        $defaultCode = $this->compilePrepared($compiler, $defaultSource);
+
+        self::assertStringContainsString('php::Int integer = php::toInt(42L);', $defaultCode);
+        self::assertStringNotContainsString('php::Var integer = 42L;', $defaultCode);
+    }
+
+    private function createCompiler(): CompilerTest
+    {
+        global $translator;
+        $compiler = CompilerTest::create(TYPEPHP_ROOT_PATH);
+        $translator = $compiler;
+        return $compiler;
+    }
+
+    private function compileSource(CompilerTest $compiler, string $source): string
+    {
+        $compiler->addFiles([$source]);
+        $compiler->prepareFile($source);
+        return $this->compilePrepared($compiler, $source);
+    }
+
+    private function compilePrepared(CompilerTest $compiler, string $source): string
+    {
+        $generated = $compiler->convertFile($source);
+        $code = file_get_contents($generated);
+        self::assertIsString($code);
+        return $code;
+    }
+}
diff --git a/src/CompilerBase.php b/src/CompilerBase.php
index ad493ce4..13830967 100644
--- a/src/CompilerBase.php
+++ b/src/CompilerBase.php
@@ -488,7 +488,8 @@ class CompilerBase implements PropertyAccessContext
     protected array $nativeClassDeclarations = [];
     /** @var array<string, true> Request-reset initialization flags for Native static locals. */
     protected array $nativeStaticInitializers = [];
-    protected bool $nativeTypes = false;
+    /** Box inferred integer locals in php::Var to retain Zend integer widening semantics. */
+    protected bool $varIntTypes = false;
     protected bool $decimalTypes = false;
     protected bool $bigintTypes = false;
     protected string $rootPath;
@@ -1050,7 +1051,7 @@ class CompilerBase implements PropertyAccessContext
     protected function resetFile(): void
     {
         $this->indentLevel = 0;
-        $this->nativeTypes = false;
+        $this->varIntTypes = false;
         $this->decimalTypes = false;
         $this->bigintTypes = false;
         $this->classesDefineInFile = [];
@@ -2489,13 +2490,12 @@ class CompilerBase implements PropertyAccessContext
         }
         // The return value of the actual function.
         $type = $this->detectTypeOfExpr($v->expr);
-        // In ordinary PHP mode, int +/−/* int is only conditionally an int:
+        // In varint mode, int +/−/* int is only conditionally an int:
         // runtime overflow promotes the result to float. Keep the Variant
         // representation through the return boundary so a declared scalar
         // return type observes and rejects that float exactly as PHP does.
-        // `use native_types` intentionally opts into native C++ arithmetic
-        // semantics and is therefore excluded from this check.
-        if (!$this->nativeTypes && $type === Type::INT && $this->exprCanOverflowInt($v->expr)) {
+        // Native C++ arithmetic is the default and is therefore excluded.
+        if ($this->varIntTypes && $type === Type::INT && $this->exprCanOverflowInt($v->expr)) {
             $type = Type::VAR;
         }
         $nativeExpressionClass = $this->detectClassOfExpr($v->expr);
@@ -3009,7 +3009,7 @@ class CompilerBase implements PropertyAccessContext
             case 'Expr_UnaryPlus':
                 $innerType = $this->detectTypeOfExpr($expr->expr);
                 if (
-                    !$this->nativeTypes
+                    $this->varIntTypes
                     && $exprType === 'Expr_UnaryMinus'
                     && $innerType === Type::INT
                     && $this->constantIntValue($expr->expr) === PHP_INT_MIN
@@ -3097,7 +3097,7 @@ class CompilerBase implements PropertyAccessContext
                 if ($leftType === Type::FLOAT || $rightType === Type::FLOAT) {
                     return Type::FLOAT;
                 }
-                if (!$this->nativeTypes && $leftType === Type::INT && $rightType === Type::INT) {
+                if ($this->varIntTypes && $leftType === Type::INT && $rightType === Type::INT) {
                     $op = match ($exprType) {
                         'Expr_BinaryOp_Plus' => '+',
                         'Expr_BinaryOp_Minus' => '-',
diff --git a/src/Optimizer/FuncCallOptimizer.php b/src/Optimizer/FuncCallOptimizer.php
index 89b4fe8a..25d1fc02 100644
--- a/src/Optimizer/FuncCallOptimizer.php
+++ b/src/Optimizer/FuncCallOptimizer.php
@@ -478,7 +478,11 @@ trait FuncCallOptimizer
             // time()). Reflection lookup failure also uses zero as its
             // unknown sentinel, so only enforce that implicit value when it
             // is greater than zero.
-            if ((array_key_exists('maxArgs', $config) || $maxArgs > 0) && $argCount > $maxArgs) {
+            $variadic = !empty($config['variadic']) || ($refInfo['variadic'] ?? false);
+            if (!$variadic
+                && (array_key_exists('maxArgs', $config) || $maxArgs > 0)
+                && $argCount > $maxArgs
+            ) {
                 $this->fatalError($expr, "{$name}() expects at most {$maxArgs} argument(s), {$argCount} given");
             }
         }
diff --git a/src/Optimizer/LoopVarOptimizer.php b/src/Optimizer/LoopVarOptimizer.php
index 7cd0e278..e56b4bbd 100644
--- a/src/Optimizer/LoopVarOptimizer.php
+++ b/src/Optimizer/LoopVarOptimizer.php
@@ -2,8 +2,8 @@
 /**
  * Range-proven loop variable optimizer.
  *
- * This pass narrows common PHP loop counters to php::Int without requiring
- * `use native_types`. It is intentionally pattern-based: PHP arithmetic can
+ * This pass narrows common PHP loop counters to php::Int even under
+ * `use varint_types`. It is intentionally pattern-based: PHP arithmetic can
  * widen integers to floats on overflow, so only monotonic counters with a
  * statically bounded range are accepted.
  */
diff --git a/src/Optimizer/SsaTypeOptimizer.php b/src/Optimizer/SsaTypeOptimizer.php
index f8eb9afb..758af384 100644
--- a/src/Optimizer/SsaTypeOptimizer.php
+++ b/src/Optimizer/SsaTypeOptimizer.php
@@ -16,6 +16,7 @@ use TypePhp\Analysis\SsaFlags;
 use TypePhp\Analysis\SsaVar;
 use PhpParser\Node;
 use PhpParser\NodeAbstract;
+use PhpParser\NodeFinder;
 
 trait SsaTypeOptimizer
 {
@@ -94,11 +95,42 @@ trait SsaTypeOptimizer
             $groups[$name][] = $ssaVar;
         }
 
-        // Type detection may inspect RHS expressions that read variables
-        // defined by earlier assignments. Code generation normally registers
-        // those locals while parsing assignments, but SSA optimization runs
-        // before that parse pass, so seed the optimization context with the
-        // SSA-defined local names as generic Vars.
+        // Type detection may inspect RHS expressions before the normal parse
+        // pass has registered their inputs. This includes variables introduced
+        // by destructuring foreach targets, which are deliberately not always
+        // represented as standalone SSA definitions. Seed every statically
+        // named variable read as Var for analysis only; resetAnalysisTemporaries()
+        // restores the real symbol table before code generation, where genuine
+        // undefined-variable diagnostics still run normally.
+        $nodeFinder = new NodeFinder();
+        foreach ($nodeFinder->findInstanceOf($ssa->getStmts(), Node\Expr\Variable::class) as $variable) {
+            if (!is_string($variable->name)) {
+                continue;
+            }
+            $varName = $this->escapeVarName($variable->name);
+            if (!isset($this->context->arguments[$varName]) && !$this->hasVar($varName)) {
+                $this->context->localVars[$varName] = Type::VAR;
+            }
+        }
+
+        // A foreach key may be int or string and a foreach value is entirely
+        // runtime-defined. Even when the same local has an earlier integer
+        // assignment, neither target can be narrowed safely. Include list
+        // destructuring targets as well.
+        $foreachTargets = [];
+        foreach ($nodeFinder->findInstanceOf($ssa->getStmts(), Node\Stmt\Foreach_::class) as $foreach) {
+            foreach ([$foreach->keyVar, $foreach->valueVar] as $target) {
+                if (!$target instanceof Node) {
+                    continue;
+                }
+                foreach ($nodeFinder->findInstanceOf($target, Node\Expr\Variable::class) as $variable) {
+                    if (is_string($variable->name)) {
+                        $foreachTargets[$variable->name] = true;
+                    }
+                }
+            }
+        }
+
         foreach (array_keys($groups) as $name) {
             $varName = $this->escapeVarName($name);
             if (!isset($this->context->arguments[$varName]) && !$this->hasVar($varName)) {
@@ -109,7 +141,7 @@ trait SsaTypeOptimizer
         foreach ($groups as $groupName => $varList) {
             $varName = $this->escapeVarName($groupName);
             // Skip parameters — they already have declared types
-            if (isset($this->context->arguments[$varName])) {
+            if (isset($this->context->arguments[$varName]) || isset($foreachTargets[$groupName])) {
                 continue;
             }
 
diff --git a/src/Parser/AssignOpTrait.php b/src/Parser/AssignOpTrait.php
index 8c7510a1..08358029 100644
--- a/src/Parser/AssignOpTrait.php
+++ b/src/Parser/AssignOpTrait.php
@@ -867,7 +867,7 @@ trait AssignOpTrait
             return $pythonOperator;
         }
         $propertyWriteTarget = $this->preparePropertyWriteTarget($node->var);
-        $this->guardLiteralDivisionByZero($node->expr, $op);
+        $this->guardLiteralDivisionByZero($node->var, $node->expr, $op);
 
         // A compound division/modulo on a NATIVE scalar slot with a proven
         // zero divisor cannot fall through to the raw C++ operator (SIGFPE
@@ -876,16 +876,16 @@ trait AssignOpTrait
         // lower the whole expression to the PHP-semantics binary operation
         // and leave the target untouched.
         if (($op === '/=' || $op === '%=')
-            && !$this->nativeTypes
+            && $this->varIntTypes
             && $this->isZeroLiteral($node->expr)
             && $this->isVarExpr($node->var)
             && $this->hasVar((string) $this->parseIdentifier($node->var))
-            && in_array($this->detectVarType($node->var), [Type::INT, Type::FLOAT], true)
+            && $this->detectVarType($node->var) === Type::INT
         ) {
             // std::int()/std::float() values are an explicit opt-in to native
             // C++ arithmetic; changing them to PHP semantics here would be as
             // wrong as the undefined raw operation. Keep the compile-time
-            // rejection native_types mode uses.
+            // rejection used by the default native mode.
             if ($this->isExplicitNativeArithmeticExpr($node->var)) {
                 $this->fatalError($node->expr, 'Cannot divide or modulo by zero');
             }
@@ -1176,14 +1176,14 @@ trait AssignOpTrait
 
         $rightType = $this->detectTypeOfExpr($node->expr);
 
-        // In ordinary PHP mode, an int compound assignment must perform the
+        // In varint mode, an int compound assignment must perform the
         // arithmetic before the typed-property write is validated. The result
         // may therefore be a float (division or integer overflow), in which
         // case Zend rejects the write and leaves the old property value intact.
         // A direct zend_long reference would bypass that behavior completely.
         // Native objects cannot cross the Variant boundary and retain their
         // native C++ property access path.
-        if (!$this->nativeTypes
+        if ($this->varIntTypes
             && $def->type === Type::INT
             && !$this->isNativeObjectClass($this->detectClassOfExpr($node->var->var))
             && in_array($op, ['+=', '-=', '*=', '/=', '%=', '**=', '<<=', '>>=', '&=', '|=', '^='], true)
diff --git a/src/Parser/BinaryOpTrait.php b/src/Parser/BinaryOpTrait.php
index a6cb87ad..89a6aca0 100644
--- a/src/Parser/BinaryOpTrait.php
+++ b/src/Parser/BinaryOpTrait.php
@@ -129,9 +129,10 @@ trait BinaryOpTrait
             $leftExpr = $this->convertExprType($leftExpr, $leftType, Type::FLOAT);
         }
 
-        $this->guardLiteralDivisionByZero($right, $op);
+        $this->guardLiteralDivisionByZero($left, $right, $op);
 
         $constantDivisionByZero = $this->handleNestedConstantDivisionByZero(
+            $left,
             $right,
             $op,
             $leftExpr,
@@ -145,12 +146,9 @@ trait BinaryOpTrait
             if (!($leftType === Type::INT and $rightType === Type::INT)) {
                 return 'php::fn::mod(' . $leftExpr . ', ' . $rightExpr . ')';
             }
-            // PHP int modulo raises a catchable DivisionByZeroError for a
-            // zero divisor and defines PHP_INT_MIN % -1 as 0; the raw C++ '%'
-            // is undefined behavior for both. Route dynamic int modulo through
-            // the PHP mod function unless the user explicitly selected
-            // `use native_types`. Constant operands are folded below.
-            if (!$this->nativeTypes
+            // varint_types retains PHP's catchable modulo errors and
+            // PHP_INT_MIN % -1 behavior. Native integers use raw C++ rules.
+            if ($this->varIntTypes
                 && !$this->isExplicitNativeArithmeticExpr($left)
                 && !$this->isExplicitNativeArithmeticExpr($right)
                 && $this->evaluateConstantIntArithmetic($left, $right, '%') === null
@@ -169,10 +167,9 @@ trait BinaryOpTrait
             // right-shifted value) and negative shift counts raise a catchable
             // ArithmeticError, while the raw C++ shift is undefined behavior
             // for both; a raw left shift into the sign bit is also undefined.
-            // Route dynamic int shifts through the encapsulated Variant
-            // operators unless the user explicitly selected `use native_types`.
-            // Constant shifts that C++ defines identically to PHP stay raw.
-            if (!$this->nativeTypes
+            // In varint mode, route dynamic shifts through Variant. Constant
+            // shifts that C++ defines identically to PHP stay raw.
+            if ($this->varIntTypes
                 && !$this->isExplicitNativeArithmeticExpr($left)
                 && !$this->isExplicitNativeArithmeticExpr($right)
                 && $leftType === Type::INT
@@ -200,10 +197,9 @@ trait BinaryOpTrait
         // Declared int parameters use the native Int ABI even in ordinary PHP
         // mode. Direct C++ +/−/* can overflow, while C++ integer division
         // truncates and cannot raise PHP's DivisionByZeroError. Route dynamic
-        // integer arithmetic through the encapsulated Variant operators unless
-        // the user explicitly selected `use native_types`. Fully constant
-        // expressions remain safe to emit directly after the checks above.
-        if (!$this->nativeTypes
+        // integer arithmetic through the encapsulated Variant operators only
+        // when varint_types explicitly requests PHP widening semantics.
+        if ($this->varIntTypes
             && $leftType === Type::INT
             && $rightType === Type::INT
             && in_array($op, ['+', '-', '*', '/'], true)
@@ -221,11 +217,9 @@ trait BinaryOpTrait
         // C++ '/': zend_long division truncates (7 / 2 is 3.5 in PHP, 3 in
         // C++), division by zero must raise the catchable DivisionByZeroError
         // (raw integer division is UB, raw double division yields INF/NAN),
-        // and PHP_INT_MIN / -1 promotes to float. Route dynamic division
-        // through the encapsulated Variant operator unless the user explicitly
-        // selected `use native_types`. Fully constant operands are folded
-        // above or are exact when emitted directly.
-        if (!$this->nativeTypes
+        // and PHP_INT_MIN / -1 promotes to float. varint_types explicitly
+        // selects this Variant path; native scalar division is the default.
+        if ($this->varIntTypes
             && $op === '/'
             && !$this->isExplicitNativeArithmeticExpr($left)
             && !$this->isExplicitNativeArithmeticExpr($right)
@@ -241,8 +235,8 @@ trait BinaryOpTrait
     }
 
     /**
-     * std::int/float/bool explicitly opt a value into native C++ arithmetic,
-     * independently of the file-wide `use native_types` declaration.
+     * std::int/float/bool explicitly retain native C++ arithmetic inside a
+     * file that selected `use varint_types`.
      */
     protected function isExplicitNativeArithmeticExpr(NodeAbstract $expr): bool
     {
@@ -277,7 +271,7 @@ trait BinaryOpTrait
 
         $wordSize = PHP_INT_SIZE * 8;
 
-        if ($this->nativeTypes) {
+        if (!$this->varIntTypes) {
             if ($shiftValue >= $wordSize) {
                 $this->fatalError(
                     $right,
@@ -371,7 +365,7 @@ trait BinaryOpTrait
             return null;
         }
 
-        if ($this->nativeTypes) {
+        if (!$this->varIntTypes) {
             if ($evaluation['cppUndefined']) {
                 $this->fatalError(
                     $left,
@@ -448,7 +442,7 @@ trait BinaryOpTrait
      */
     protected function constantIntValue(NodeAbstract $expr): ?int
     {
-        $value = $this->constantNumericValue($expr, $this->nativeTypes);
+        $value = $this->constantNumericValue($expr, !$this->varIntTypes);
         return is_int($value) ? $value : null;
     }
 
@@ -578,6 +572,7 @@ trait BinaryOpTrait
     }
 
     protected function handleNestedConstantDivisionByZero(
+        NodeAbstract $left,
         NodeAbstract $right,
         string $op,
         string $leftExpr,
@@ -588,13 +583,13 @@ trait BinaryOpTrait
         }
 
         if (!$this->isZeroLiteral($right)) {
-            $rightValue = $this->constantNumericValue($right, $this->nativeTypes);
+            $rightValue = $this->constantNumericValue($right, !$this->varIntTypes);
             if ($rightValue === null || $rightValue != 0) {
                 return null;
             }
         }
 
-        if ($this->nativeTypes) {
+        if (!$this->usesPhpArithmeticForZeroDivisor($left, $right)) {
             $this->fatalError($right, 'Constant division or modulo by zero has undefined behavior in C++ native mode');
         }
 
@@ -689,7 +684,7 @@ trait BinaryOpTrait
             $type = $this->getOrderedOperandTmpType($expr, (string) $value);
             $tmpVar = $this->addTmpVar($type);
         }
-        if ($this->nativeTypes && $this->isNativeType($type)) {
+        if ($this->usesNativeScalarStorage($type)) {
             // A native temporary has a fixed C++ scalar ABI. The expression
             // can still contain a dynamic operand (for example, an array
             // element), so normalize it at the materialization boundary.
@@ -721,7 +716,7 @@ trait BinaryOpTrait
             && $this->isVarExpr($expr->var)
         ) {
             $type = $this->getVarType($this->parseIdentifier($expr->var));
-            if ($this->nativeTypes && $this->isNativeType($type)) {
+            if ($this->usesNativeScalarStorage($type)) {
                 return $type;
             }
             return Type::VAR;
@@ -736,7 +731,7 @@ trait BinaryOpTrait
             $type = $this->detectTypeOfExpr($expr);
             if (
                 in_array($type, [Type::BIGINT, Type::DECIMAL, Type::BIGFLOAT], true)
-                || ($this->nativeTypes && $this->isNativeType($type))
+                || $this->usesNativeScalarStorage($type)
             ) {
                 // Calls and nested binary operands are materialized to preserve
                 // PHP's left-to-right evaluation order. In native-types mode
@@ -778,7 +773,7 @@ trait BinaryOpTrait
         $type = $this->detectTypeOfExpr($expr);
         if ($expr instanceof Expr\Variable
             || in_array($type, [Type::BIGINT, Type::DECIMAL, Type::BIGFLOAT], true)
-            || ($this->nativeTypes && $this->isNativeType($type))
+            || $this->usesNativeScalarStorage($type)
         ) {
             return $type;
         }
@@ -821,7 +816,7 @@ trait BinaryOpTrait
      */
     protected function tryParseFinalIntPropertyAddChain(Expr\BinaryOp\Plus $expr): ?string
     {
-        if ($this->nativeTypes) {
+        if (!$this->varIntTypes) {
             return null;
         }
 
@@ -1424,10 +1419,14 @@ trait BinaryOpTrait
             ?? $this->parseBinaryOp($expr->left, $expr->right, '/');
     }
 
-    protected function guardLiteralDivisionByZero(NodeAbstract $right, string $op): void
+    protected function guardLiteralDivisionByZero(
+        NodeAbstract $left,
+        NodeAbstract $right,
+        string $op
+    ): void
     {
         if (($op === '/' or $op === '%' or $op === '/=' or $op === '%=') and $this->isZeroLiteral($right)) {
-            if ($this->nativeTypes) {
+            if (!$this->usesPhpArithmeticForZeroDivisor($left, $right)) {
                 $this->fatalError($right, 'Cannot divide or modulo by zero');
             }
             // PHP raises a catchable DivisionByZeroError at runtime, and only
@@ -1437,6 +1436,19 @@ trait BinaryOpTrait
         }
     }
 
+    /**
+     * A boxed operand already carries Zend arithmetic semantics regardless of
+     * the file mode. varint_types additionally opts integer arithmetic into
+     * that path; native scalar expressions reject statically known zero
+     * divisors before raw C++ arithmetic can produce UB or infinity.
+     */
+    protected function usesPhpArithmeticForZeroDivisor(NodeAbstract $left, NodeAbstract $right): bool
+    {
+        return $this->varIntTypes
+            || $this->detectTypeOfExpr($left) === Type::VAR
+            || $this->detectTypeOfExpr($right) === Type::VAR;
+    }
+
     protected function parseBinaryOpMinus(Expr\BinaryOp\Minus $expr): string
     {
         return $this->parsePythonBinaryOperator($expr)
diff --git a/src/Parser/PropertyAccessTrait.php b/src/Parser/PropertyAccessTrait.php
index c3e32da3..9cca3ba8 100644
--- a/src/Parser/PropertyAccessTrait.php
+++ b/src/Parser/PropertyAccessTrait.php
@@ -512,7 +512,7 @@ trait PropertyAccessTrait
             $nativeProp = $resolution->expression;
             $def = $this->getNativePropertyDef($expr);
             $class = $resolution->class;
-            if ($this->nativeTypes && $def && $class !== null) {
+            if ($def && $class !== null && $this->usesNativeScalarStorage($def->type)) {
                 $this->setNativePropertyValueSource($expr, self::NATIVE_PROPERTY_VALUE_VAR);
                 return $this->emitNativeStaticPropertyTypedFetch($expr, $class, $def, $nativeProp);
             }
@@ -1244,7 +1244,7 @@ trait PropertyAccessTrait
             $getProperty = $objectVar . '.attr(' . $id . ', ' . $this->escapeAttrMode($update) . ')';
         }
         $def = $this->getNativePropertyDef($expr);
-        if ($def and $this->nativeTypes) {
+        if ($def && $this->usesNativeScalarStorage($def->type)) {
             $propName = $this->parseIdentifier($property);
             $typedFetch = $this->emitNativeInstancePropertyTypedFetch(
                 $expr,
diff --git a/src/Parser/TypeConversionTrait.php b/src/Parser/TypeConversionTrait.php
index 5e7da7fc..5db48a9b 100644
--- a/src/Parser/TypeConversionTrait.php
+++ b/src/Parser/TypeConversionTrait.php
@@ -226,7 +226,17 @@ trait TypeConversionTrait
         if ($type === Type::FLOAT && $this->decimalTypes) {
             return Type::DECIMAL;
         }
-        return $this->nativeTypes ? $type : Type::VAR;
+        return $type === Type::INT && $this->varIntTypes ? Type::VAR : $type;
+    }
+
+    /**
+     * Whether an inferred scalar has fixed C++ storage in the current file.
+     * Float and bool are always native; varint_types only boxes integers.
+     */
+    protected function usesNativeScalarStorage(string $type): bool
+    {
+        return $this->isNativeType($type)
+            && !($type === Type::INT && $this->varIntTypes);
     }
 
     protected function convertExprFromType(string $type, string $expr): string
diff --git a/src/Parser/UnaryExpressionTrait.php b/src/Parser/UnaryExpressionTrait.php
index 9fd45e5a..6fbe1f62 100644
--- a/src/Parser/UnaryExpressionTrait.php
+++ b/src/Parser/UnaryExpressionTrait.php
@@ -113,7 +113,7 @@ trait UnaryExpressionTrait
         if ($type === Type::INT) {
             $value = $this->constantIntValue($expr->expr);
             if ($value === PHP_INT_MIN) {
-                if ($this->nativeTypes) {
+                if (!$this->varIntTypes) {
                     $this->fatalError(
                         $expr,
                         'Negating PHP_INT_MIN has undefined behavior in C++ native mode'
diff --git a/src/Resolver/DeclarationSymbolTrait.php b/src/Resolver/DeclarationSymbolTrait.php
index 52e9a36d..c2987cf0 100644
--- a/src/Resolver/DeclarationSymbolTrait.php
+++ b/src/Resolver/DeclarationSymbolTrait.php
@@ -88,7 +88,12 @@ trait DeclarationSymbolTrait
             } else {
                 $idLower = strtolower($id);
                 if ($idLower === 'native_types') {
-                    $this->nativeTypes = true;
+                    $this->fatalError(
+                        $use,
+                        '`use native_types` has been removed; native scalar types are now the default',
+                    );
+                } elseif ($idLower === 'varint_types') {
+                    $this->varIntTypes = true;
                 } elseif ($idLower === 'decimal_types') {
                     $this->decimalTypes = true;
                 } elseif ($idLower === 'bigint_types') {
diff --git a/src/Translator.php b/src/Translator.php
index 433faeb8..53df8acc 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -5026,11 +5026,11 @@ CODE;
             $ssaBuilder->build();
             $this->context->ssaBuilder = $ssaBuilder;
             $this->analyzeStableObjects($ssaBuilder);
-            // Range-proven loop counters are safe to narrow even without
-            // `use native_types`: the optimizer rejects counters whose PHP
+            // Range-proven loop counters are safe to narrow even with
+            // `use varint_types`: the optimizer rejects counters whose PHP
             // integer semantics could widen to float or otherwise escape.
             $optimizedLoopVars = $this->optimizeLoopVars($ssaBuilder);
-            if ($this->nativeTypes) {
+            if (!$this->varIntTypes) {
                 // Narrow local variable types based on SSA analysis.
                 $this->optimizeVarTypes($ssaBuilder);
                 // Narrow native property accesses.
diff --git a/src/polyfills.php b/src/polyfills.php
index 1687f13e..cbd59a7e 100644
--- a/src/polyfills.php
+++ b/src/polyfills.php
@@ -143,8 +143,8 @@ final class Type
     public const string Box = 'box';
 }
 
-/** @deprecated Compiler directive retained independently of public type symbols. */
-class native_types
+/** Compiler directive that opts inferred integer locals into Variant storage. */
+class varint_types
 {
 }
 
diff --git a/tests/compiler/array_method/misc.phpt b/tests/compiler/array_method/misc.phpt
index 00d4d0ea..8bb65b7c 100644
--- a/tests/compiler/array_method/misc.phpt
+++ b/tests/compiler/array_method/misc.phpt
@@ -2,8 +2,6 @@
 Universal method call on native typed variables
 --FILE--
 <?php
-use native_types;
-
 function main()
 {
     // Int methods
diff --git a/tests/compiler/basic/global-int.phpt b/tests/compiler/basic/global-int.phpt
index 9518e1e8..aa4eafbc 100644
--- a/tests/compiler/basic/global-int.phpt
+++ b/tests/compiler/basic/global-int.phpt
@@ -2,8 +2,6 @@
 global vars with native types
 --FILE--
 <?php
-use native_types;
-
 function increment_global_int(int $n): void {
     global $global_int;
     for ($i = 0; $i < $n; $i++) {
diff --git a/tests/compiler/basic/pow-int-overflow-native-type.phpt b/tests/compiler/basic/pow-int-overflow-native-type.phpt
index bccfa002..d98aeece 100644
--- a/tests/compiler/basic/pow-int-overflow-native-type.phpt
+++ b/tests/compiler/basic/pow-int-overflow-native-type.phpt
@@ -2,7 +2,6 @@
 pow int overflow
 --FILE--
 <?php
-use native_types;
 function main()
 {
     // PHP 8.5 warns when the overflowing float is narrowed to a native int.
diff --git a/tests/compiler/basic/pow-int-overflow-warning-php85.phpt b/tests/compiler/basic/pow-int-overflow-warning-php85.phpt
index 46bb8262..a77c0702 100644
--- a/tests/compiler/basic/pow-int-overflow-warning-php85.phpt
+++ b/tests/compiler/basic/pow-int-overflow-warning-php85.phpt
@@ -8,7 +8,6 @@ if (PHP_VERSION_ID < 80500) {
 ?>
 --FILE--
 <?php
-use native_types;
 function main(): void
 {
     $value = 2 ** 80;
diff --git a/tests/compiler/basic/std_builtin.phpt b/tests/compiler/basic/std_builtin.phpt
index 69393887..a07a1483 100644
--- a/tests/compiler/basic/std_builtin.phpt
+++ b/tests/compiler/basic/std_builtin.phpt
@@ -3,8 +3,6 @@ std::bigInt() and std::decimal() builtin functions
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // std::bigInt from big literal (auto-detected BigInt → no-op pass-through)
     $a = std::bigInt(12345678901234567890);
diff --git a/tests/compiler/bigint/arithmetic.phpt b/tests/compiler/bigint/arithmetic.phpt
index 8a133fa8..e23ac4e6 100644
--- a/tests/compiler/bigint/arithmetic.phpt
+++ b/tests/compiler/bigint/arithmetic.phpt
@@ -3,8 +3,6 @@ BigInt arithmetic operations
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = 12345678901234567890;
     $b = 98765432109876543210;
diff --git a/tests/compiler/bigint/assign_op.phpt b/tests/compiler/bigint/assign_op.phpt
index 1212d2b5..c37f12b1 100644
--- a/tests/compiler/bigint/assign_op.phpt
+++ b/tests/compiler/bigint/assign_op.phpt
@@ -3,8 +3,6 @@ BigInt compound assignment operators (+=, -=, *=, /=, %=)
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // BigInt +=
     $a = std::bigInt(100);
diff --git a/tests/compiler/bigint/bitwise.phpt b/tests/compiler/bigint/bitwise.phpt
index 3427bc10..db9d51a9 100644
--- a/tests/compiler/bigint/bitwise.phpt
+++ b/tests/compiler/bigint/bitwise.phpt
@@ -3,8 +3,6 @@ BigInt bitwise operations (&, |, ^, ~, &=, |=, ^=, testBit, popCount)
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt("240");  // 0xF0
     $b = std::bigInt("15");   // 0x0F
diff --git a/tests/compiler/bigint/bitwise_shift.phpt b/tests/compiler/bigint/bitwise_shift.phpt
index 42284169..1549b345 100644
--- a/tests/compiler/bigint/bitwise_shift.phpt
+++ b/tests/compiler/bigint/bitwise_shift.phpt
@@ -3,8 +3,6 @@ BigInt bitwise shift operations (<<, >>, <<=, >>=, bitShiftLeft, bitShiftRight)
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt("16");  // 0b10000
 
diff --git a/tests/compiler/bigint/compare.phpt b/tests/compiler/bigint/compare.phpt
index 00e0bc3a..c1c19f8a 100644
--- a/tests/compiler/bigint/compare.phpt
+++ b/tests/compiler/bigint/compare.phpt
@@ -3,8 +3,6 @@ BigInt comparison
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = 12345678901234567890;
     $b = 98765432109876543210;
diff --git a/tests/compiler/bigint/divmod.phpt b/tests/compiler/bigint/divmod.phpt
index 7e59b364..793b3654 100644
--- a/tests/compiler/bigint/divmod.phpt
+++ b/tests/compiler/bigint/divmod.phpt
@@ -3,8 +3,6 @@ BigInt: divmod
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt(10);
     $b = std::bigInt(3);
diff --git a/tests/compiler/bigint/gcd.phpt b/tests/compiler/bigint/gcd.phpt
index 4d178146..a3d7b9fb 100644
--- a/tests/compiler/bigint/gcd.phpt
+++ b/tests/compiler/bigint/gcd.phpt
@@ -3,8 +3,6 @@ BigInt: gcd
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt(12);
     $b = std::bigInt(8);
diff --git a/tests/compiler/bigint/literal.phpt b/tests/compiler/bigint/literal.phpt
index c84a829b..a43c7561 100644
--- a/tests/compiler/bigint/literal.phpt
+++ b/tests/compiler/bigint/literal.phpt
@@ -3,8 +3,6 @@ BigInt literal parsing and output
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = 12345678901234567890;
     echo $a->toString();
diff --git a/tests/compiler/bigint/math_func_opt.phpt b/tests/compiler/bigint/math_func_opt.phpt
index 70526db9..6663433e 100644
--- a/tests/compiler/bigint/math_func_opt.phpt
+++ b/tests/compiler/bigint/math_func_opt.phpt
@@ -3,8 +3,6 @@ Big* types: math function optimization (abs/pow/sqrt/floor/ceil/round)
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // BigInt
     $a = std::bigInt("100");
diff --git a/tests/compiler/bigint/mixed.phpt b/tests/compiler/bigint/mixed.phpt
index 70d1c43b..6f9f51c3 100644
--- a/tests/compiler/bigint/mixed.phpt
+++ b/tests/compiler/bigint/mixed.phpt
@@ -3,8 +3,6 @@ BigInt mixed operations with Int
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = 12345678901234567890;
     // BigInt + Int
diff --git a/tests/compiler/bigint/operator.phpt b/tests/compiler/bigint/operator.phpt
index 5645657c..24cb96cf 100644
--- a/tests/compiler/bigint/operator.phpt
+++ b/tests/compiler/bigint/operator.phpt
@@ -3,8 +3,6 @@ BigInt binary operators (+, -, *, /, %) and unary minus
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt(100);
 
diff --git a/tests/compiler/bigint/pow-right-bigint.phpt b/tests/compiler/bigint/pow-right-bigint.phpt
index 2a34c546..2a20bad4 100644
--- a/tests/compiler/bigint/pow-right-bigint.phpt
+++ b/tests/compiler/bigint/pow-right-bigint.phpt
@@ -3,8 +3,6 @@ BigInt exponentiation dispatches when BigInt is the right operand
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $exponent = std::bigInt("10");
     echo (2 ** $exponent)->toString(), "\n";
diff --git a/tests/compiler/bigint/pow.phpt b/tests/compiler/bigint/pow.phpt
index d4869c8b..91377943 100644
--- a/tests/compiler/bigint/pow.phpt
+++ b/tests/compiler/bigint/pow.phpt
@@ -2,8 +2,6 @@
 BigInt: pow
 --FILE--
 <?php
-use native_types;
-
 function main()
 {
     require __DIR__ . '/../../../src/Assert.php';
diff --git a/tests/compiler/bigint/powmod.phpt b/tests/compiler/bigint/powmod.phpt
index caa326db..4ea681b6 100644
--- a/tests/compiler/bigint/powmod.phpt
+++ b/tests/compiler/bigint/powmod.phpt
@@ -3,8 +3,6 @@ BigInt: powmod
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // 2^10 mod 1000 = 1024 mod 1000 = 24
     $a = std::bigInt(2);
diff --git a/tests/compiler/bigint/sqrt.phpt b/tests/compiler/bigint/sqrt.phpt
index 5a6c27fa..6f79edd4 100644
--- a/tests/compiler/bigint/sqrt.phpt
+++ b/tests/compiler/bigint/sqrt.phpt
@@ -3,8 +3,6 @@ BigInt: sqrt
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt(0);
     echo $a->sqrt()->toString(); echo "\n";
diff --git a/tests/compiler/bigint/toInt_toFloat.phpt b/tests/compiler/bigint/toInt_toFloat.phpt
index 6dc2e37d..4827ed68 100644
--- a/tests/compiler/bigint/toInt_toFloat.phpt
+++ b/tests/compiler/bigint/toInt_toFloat.phpt
@@ -3,8 +3,6 @@ BigInt: toInt / toFloat
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::bigInt(42);
     var_dump($a->toInt());
diff --git a/tests/compiler/bigint/toString_cast.phpt b/tests/compiler/bigint/toString_cast.phpt
index baf65493..a835c398 100644
--- a/tests/compiler/bigint/toString_cast.phpt
+++ b/tests/compiler/bigint/toString_cast.phpt
@@ -3,8 +3,6 @@ Big* types: (string) cast, strval() and echo → toString()
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // BigInt
     $a = std::bigInt("12345678901234567890");
diff --git a/tests/compiler/bignumber/big_number_operators.phpt b/tests/compiler/bignumber/big_number_operators.phpt
index 86b3e2b2..ef6c33ae 100644
--- a/tests/compiler/bignumber/big_number_operators.phpt
+++ b/tests/compiler/bignumber/big_number_operators.phpt
@@ -3,8 +3,6 @@ BigInt and Decimal operator overloading (+, -, *, /, %, **, <, >, <=, >=, ==, !=
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // === BigInt arithmetic operators ===
     $a = std::bigInt(100);
diff --git a/tests/compiler/bignumber/bigfloat-high-precision.phpt b/tests/compiler/bignumber/bigfloat-high-precision.phpt
index fe318f65..d9005c97 100644
--- a/tests/compiler/bignumber/bigfloat-high-precision.phpt
+++ b/tests/compiler/bignumber/bigfloat-high-precision.phpt
@@ -3,8 +3,6 @@ BigFloat arithmetic retains precision beyond IEEE double
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $large = std::bigFloat("1000000000000000000000000000000");
     $one = std::bigFloat("1");
diff --git a/tests/compiler/bignumber/bigfloat_operators.phpt b/tests/compiler/bignumber/bigfloat_operators.phpt
index 67a0822f..e6e42f81 100644
--- a/tests/compiler/bignumber/bigfloat_operators.phpt
+++ b/tests/compiler/bignumber/bigfloat_operators.phpt
@@ -3,8 +3,6 @@ BigFloat operator overloading (+, -, *, /) and comparisons (<, >, <=, >=, ==, !=
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // === BigFloat arithmetic operators ===
     $a = std::bigFloat(100.5);
diff --git a/tests/compiler/bignumber/conversions-and-boundaries.phpt b/tests/compiler/bignumber/conversions-and-boundaries.phpt
index 3cae92ef..a0826d0b 100644
--- a/tests/compiler/bignumber/conversions-and-boundaries.phpt
+++ b/tests/compiler/bignumber/conversions-and-boundaries.phpt
@@ -3,8 +3,6 @@ Big numeric casts, conversion functions, and runtime boundaries
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $bigint = std::bigInt("42");
     var_dump((int) $bigint, (float) $bigint, (bool) $bigint);
diff --git a/tests/compiler/bignumber/logical-and-unary-operators.phpt b/tests/compiler/bignumber/logical-and-unary-operators.phpt
index ed2a4b72..519ae600 100644
--- a/tests/compiler/bignumber/logical-and-unary-operators.phpt
+++ b/tests/compiler/bignumber/logical-and-unary-operators.phpt
@@ -3,8 +3,6 @@ Big numeric unary plus and boolean contexts use numeric truth values
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $bi0 = std::bigInt(0);
     $bi1 = std::bigInt(1);
diff --git a/tests/compiler/bignumber/operator-error-boundaries.phpt b/tests/compiler/bignumber/operator-error-boundaries.phpt
index 59e72133..6c147458 100644
--- a/tests/compiler/bignumber/operator-error-boundaries.phpt
+++ b/tests/compiler/bignumber/operator-error-boundaries.phpt
@@ -3,8 +3,6 @@ Big numeric operator error boundaries use PHP-compatible exception types
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     try {
         $unused = std::bigInt(1) / 0;
diff --git a/tests/compiler/bignumber/reverse-and-compound-operators.phpt b/tests/compiler/bignumber/reverse-and-compound-operators.phpt
index 68438136..ae7d990f 100644
--- a/tests/compiler/bignumber/reverse-and-compound-operators.phpt
+++ b/tests/compiler/bignumber/reverse-and-compound-operators.phpt
@@ -3,8 +3,6 @@ Big numeric reverse non-commutative and BigFloat compound operators
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $bi = std::bigInt(4);
     echo (10 - $bi)->toString(), "\n";
diff --git a/tests/compiler/callable/first-class-callable-property-optimizer.phpt b/tests/compiler/callable/first-class-callable-property-optimizer.phpt
index 7e009fb0..dbbe3be7 100644
--- a/tests/compiler/callable/first-class-callable-property-optimizer.phpt
+++ b/tests/compiler/callable/first-class-callable-property-optimizer.phpt
@@ -3,8 +3,6 @@ First-class callable placeholder is not treated as a call argument by property o
 --FILE--
 <?php
 
-use native_types;
-
 class FirstClassCallableTarget
 {
     public int $counter = 0;
diff --git a/tests/compiler/decimal/arithmetic.phpt b/tests/compiler/decimal/arithmetic.phpt
index 284993c5..2a063be7 100644
--- a/tests/compiler/decimal/arithmetic.phpt
+++ b/tests/compiler/decimal/arithmetic.phpt
@@ -3,8 +3,6 @@ Decimal arithmetic operations
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("100.50");
     $b = std::decimal("50.25");
diff --git a/tests/compiler/decimal/assign_op.phpt b/tests/compiler/decimal/assign_op.phpt
index 2a446097..5fb3be0e 100644
--- a/tests/compiler/decimal/assign_op.phpt
+++ b/tests/compiler/decimal/assign_op.phpt
@@ -3,8 +3,6 @@ Decimal compound assignment operators (+=, -=, *=, /=, %=)
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // Decimal +=
     $a = std::decimal("100.50");
diff --git a/tests/compiler/decimal/ceil.phpt b/tests/compiler/decimal/ceil.phpt
index 302b2a7e..ef616ae6 100644
--- a/tests/compiler/decimal/ceil.phpt
+++ b/tests/compiler/decimal/ceil.phpt
@@ -3,8 +3,6 @@ Decimal: ceil
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("3.2");
     var_dump($a->ceil()->toString());
diff --git a/tests/compiler/decimal/compare.phpt b/tests/compiler/decimal/compare.phpt
index 1b348c20..d92bfc20 100644
--- a/tests/compiler/decimal/compare.phpt
+++ b/tests/compiler/decimal/compare.phpt
@@ -3,8 +3,6 @@ Decimal comparison and conversions
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("123.456");
     $b = std::decimal("789.012");
diff --git a/tests/compiler/decimal/divmod.phpt b/tests/compiler/decimal/divmod.phpt
index 7d1a520b..85a988ab 100644
--- a/tests/compiler/decimal/divmod.phpt
+++ b/tests/compiler/decimal/divmod.phpt
@@ -3,8 +3,6 @@ Decimal: divmod
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("10");
     $b = std::decimal("3");
diff --git a/tests/compiler/decimal/floor.phpt b/tests/compiler/decimal/floor.phpt
index 97b38fc4..2fbba2f3 100644
--- a/tests/compiler/decimal/floor.phpt
+++ b/tests/compiler/decimal/floor.phpt
@@ -3,8 +3,6 @@ Decimal: floor
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("3.7");
     var_dump($a->floor()->toString());
diff --git a/tests/compiler/decimal/literal.phpt b/tests/compiler/decimal/literal.phpt
index 69064614..b0740fe6 100644
--- a/tests/compiler/decimal/literal.phpt
+++ b/tests/compiler/decimal/literal.phpt
@@ -2,8 +2,6 @@
 decimal: literal
 --FILE--
 <?php
-use native_types;
-
 function main()
 {
     require __DIR__ . '/../../../src/Assert.php';
@@ -13,4 +11,4 @@ function main()
 }
 ?>
 --EXPECT--
-string(3) "4.3"
\ No newline at end of file
+string(3) "4.3"
diff --git a/tests/compiler/decimal/operator.phpt b/tests/compiler/decimal/operator.phpt
index 407d5359..364a190e 100644
--- a/tests/compiler/decimal/operator.phpt
+++ b/tests/compiler/decimal/operator.phpt
@@ -3,8 +3,6 @@ Decimal operator overloading (+, -, *, /, %) and comparisons
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $dec = std::decimal("100.25");
 
diff --git a/tests/compiler/decimal/pow.phpt b/tests/compiler/decimal/pow.phpt
index 5bf64ceb..d9dbc3ac 100644
--- a/tests/compiler/decimal/pow.phpt
+++ b/tests/compiler/decimal/pow.phpt
@@ -3,8 +3,6 @@ Decimal: pow
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("2");
     var_dump($a->pow(std::decimal("3"))->toString());
diff --git a/tests/compiler/decimal/powmod.phpt b/tests/compiler/decimal/powmod.phpt
index a6369d0a..8316b9c1 100644
--- a/tests/compiler/decimal/powmod.phpt
+++ b/tests/compiler/decimal/powmod.phpt
@@ -3,8 +3,6 @@ Decimal: powmod
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // 2^10 mod 1000 = 24
     $a = std::decimal("2");
diff --git a/tests/compiler/decimal/precision-and-exception-boundaries.phpt b/tests/compiler/decimal/precision-and-exception-boundaries.phpt
index 0141d5ae..c7064775 100644
--- a/tests/compiler/decimal/precision-and-exception-boundaries.phpt
+++ b/tests/compiler/decimal/precision-and-exception-boundaries.phpt
@@ -3,8 +3,6 @@ Decimal keeps 50 digits and translates native arithmetic errors
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $large = std::decimal("1234567890123456789012345678901234567890123456789");
     echo ($large + 1)->toString(), "\n";
diff --git a/tests/compiler/decimal/round.phpt b/tests/compiler/decimal/round.phpt
index ba4ccc61..902b0618 100644
--- a/tests/compiler/decimal/round.phpt
+++ b/tests/compiler/decimal/round.phpt
@@ -3,8 +3,6 @@ Decimal: round
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     // round without precision (default 0, round to integer)
     $a = std::decimal("3.4");
diff --git a/tests/compiler/decimal/sqrt.phpt b/tests/compiler/decimal/sqrt.phpt
index 5e8c172c..75a85550 100644
--- a/tests/compiler/decimal/sqrt.phpt
+++ b/tests/compiler/decimal/sqrt.phpt
@@ -3,8 +3,6 @@ Decimal: sqrt
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("0");
     var_dump($a->sqrt()->toString());
diff --git a/tests/compiler/decimal/toFloat.phpt b/tests/compiler/decimal/toFloat.phpt
index 70e3f548..54462bd4 100644
--- a/tests/compiler/decimal/toFloat.phpt
+++ b/tests/compiler/decimal/toFloat.phpt
@@ -3,8 +3,6 @@ Decimal: toFloat
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("3.14");
     var_dump($a->toFloat());
diff --git a/tests/compiler/decimal/unary_minus.phpt b/tests/compiler/decimal/unary_minus.phpt
index 903b5fb3..a5ab7151 100644
--- a/tests/compiler/decimal/unary_minus.phpt
+++ b/tests/compiler/decimal/unary_minus.phpt
@@ -3,8 +3,6 @@ Decimal unary minus operator
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 function main(): void {
     $a = std::decimal("123.456");
 
diff --git a/tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt b/tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt
index 515b2292..d35593df 100644
--- a/tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt
+++ b/tests/compiler/dynamic_call/call-magic-fallback-typed-object.phpt
@@ -2,8 +2,6 @@
 missing method on typed object dispatches to __call
 --FILE--
 <?php
-use native_types;
-
 class DynamicHandler
 {
     public function __call(string $name, array $args): string
diff --git a/tests/compiler/dynamic_call/call-multilevel-override.phpt b/tests/compiler/dynamic_call/call-multilevel-override.phpt
index 0cb7fda4..57257b85 100644
--- a/tests/compiler/dynamic_call/call-multilevel-override.phpt
+++ b/tests/compiler/dynamic_call/call-multilevel-override.phpt
@@ -2,8 +2,6 @@
 call method overridden in grandchild through base parameter
 --FILE--
 <?php
-use native_types;
-
 class Base
 {
     public function value(): string
diff --git a/tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt b/tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt
index afd93677..8e56b297 100644
--- a/tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt
+++ b/tests/compiler/dynamic_call/call-parent-sibling-dispatch.phpt
@@ -2,8 +2,6 @@
 call overridden method on sibling subclasses through parent parameter
 --FILE--
 <?php
-use native_types;
-
 class Base
 {
     public function name(): string
diff --git a/tests/compiler/dynamic_call/call-protected-override.phpt b/tests/compiler/dynamic_call/call-protected-override.phpt
index 2f794f4a..8c490e3c 100644
--- a/tests/compiler/dynamic_call/call-protected-override.phpt
+++ b/tests/compiler/dynamic_call/call-protected-override.phpt
@@ -2,8 +2,6 @@
 protected overridden method remains virtual through parent wrapper
 --FILE--
 <?php
-use native_types;
-
 class Base
 {
     protected function token(): string
diff --git a/tests/compiler/keyword_extension/001.phpt b/tests/compiler/keyword_extension/001.phpt
index 62809e03..62431587 100644
--- a/tests/compiler/keyword_extension/001.phpt
+++ b/tests/compiler/keyword_extension/001.phpt
@@ -3,8 +3,6 @@ Keyword MethodsFor method with snake_case name
 --FILE--
 <?php
 declare(strict_types=1);
-use native_types;
-
 #[MethodsFor('*')]
 final class KeywordExtensions
 {
diff --git a/tests/compiler/keyword_extension/camel.phpt b/tests/compiler/keyword_extension/camel.phpt
index c169edc1..e5a5f378 100644
--- a/tests/compiler/keyword_extension/camel.phpt
+++ b/tests/compiler/keyword_extension/camel.phpt
@@ -2,9 +2,7 @@
 Keyword MethodsFor method with lowerCamelCase name
 --FILE--
 <?php
-
 declare(strict_types=1);
-use native_types;
 
 #[MethodsFor('*')]
 final class KeywordExtensions
diff --git a/tests/compiler/object_property/001.phpt b/tests/compiler/object_property/001.phpt
index 877f41fc..ba70edf7 100644
--- a/tests/compiler/object_property/001.phpt
+++ b/tests/compiler/object_property/001.phpt
@@ -2,8 +2,6 @@
 default array property
 --FILE--
 <?php
-use native_types;
-
 class Test {
     protected int $x = 100;
 
@@ -22,4 +20,4 @@ function main() {
 }
 ?>
 --EXPECT--
-int(76193440)
\ No newline at end of file
+int(76193440)
diff --git a/tests/compiler/object_property/003.phpt b/tests/compiler/object_property/003.phpt
index 0e605843..4d389a64 100644
--- a/tests/compiler/object_property/003.phpt
+++ b/tests/compiler/object_property/003.phpt
@@ -2,8 +2,6 @@
 default array property
 --FILE--
 <?php
-use native_types;
-
 class Test {
     protected int $x = 100;
 
@@ -22,4 +20,4 @@ function main() {
 ?>
 --EXPECT--
 int(123)
-int(112)
\ No newline at end of file
+int(112)
diff --git a/tests/compiler/object_property/int-property-compound-assignment.phpt b/tests/compiler/object_property/int-property-compound-assignment.phpt
index 2631fd9b..aba96679 100644
--- a/tests/compiler/object_property/int-property-compound-assignment.phpt
+++ b/tests/compiler/object_property/int-property-compound-assignment.phpt
@@ -3,6 +3,7 @@ Typed int property compound assignments use PHP arithmetic and checked writes
 --FILE--
 <?php
 declare(strict_types=1);
+use varint_types;
 
 class IntCompoundBox
 {
diff --git a/tests/compiler/object_property/native-scalar-property-assign-op-var.phpt b/tests/compiler/object_property/native-scalar-property-assign-op-var.phpt
index 9051ebed..a6569f5f 100644
--- a/tests/compiler/object_property/native-scalar-property-assign-op-var.phpt
+++ b/tests/compiler/object_property/native-scalar-property-assign-op-var.phpt
@@ -2,8 +2,6 @@
 Native scalar object property compound assignment checks var RHS before native write
 --FILE--
 <?php
-use native_types;
-
 class NativeScalarAssignOpVarBox
 {
     public int $intValue = 1;
diff --git a/tests/compiler/object_property/native-scalar-property-assign-var.phpt b/tests/compiler/object_property/native-scalar-property-assign-var.phpt
index ef4a2a6f..f636ba75 100644
--- a/tests/compiler/object_property/native-scalar-property-assign-var.phpt
+++ b/tests/compiler/object_property/native-scalar-property-assign-var.phpt
@@ -2,8 +2,6 @@
 Native scalar object property assignment checks var RHS before native write
 --FILE--
 <?php
-use native_types;
-
 class NativeScalarAssignVarBox
 {
     public int $intValue = 0;
diff --git a/tests/compiler/object_property/native-scalar-property-namespaced-diagnostic.phpt b/tests/compiler/object_property/native-scalar-property-namespaced-diagnostic.phpt
index 4a45a8de..106e139a 100644
--- a/tests/compiler/object_property/native-scalar-property-namespaced-diagnostic.phpt
+++ b/tests/compiler/object_property/native-scalar-property-namespaced-diagnostic.phpt
@@ -3,8 +3,6 @@ Native scalar property diagnostics escape namespaced class names in generated C+
 --FILE--
 <?php
 namespace Px\C4129Repro {
-    use native_types;
-
     class NamespacedScalarProperty
     {
         public int $intValue = 0;
diff --git a/tests/compiler/object_property/native-typed-read-in-loop.phpt b/tests/compiler/object_property/native-typed-read-in-loop.phpt
index 31307861..927ad722 100644
--- a/tests/compiler/object_property/native-typed-read-in-loop.phpt
+++ b/tests/compiler/object_property/native-typed-read-in-loop.phpt
@@ -2,8 +2,6 @@
 Native typed object property read inside loop falls back to typed zval value
 --FILE--
 <?php
-use native_types;
-
 class NativeTypedLoopData
 {
     public int $val = 0;
diff --git a/tests/compiler/object_property/native-types-int-property-compound-assignment.phpt b/tests/compiler/object_property/native-types-int-property-compound-assignment.phpt
index 3e5aa90d..f08a58ae 100644
--- a/tests/compiler/object_property/native-types-int-property-compound-assignment.phpt
+++ b/tests/compiler/object_property/native-types-int-property-compound-assignment.phpt
@@ -2,8 +2,6 @@
 Native-types int property compound assignments use C++ integer semantics
 --FILE--
 <?php
-use native_types;
-
 class NativeTypesIntCompoundBox
 {
     public int $value = 0;
diff --git a/tests/compiler/object_property/readonly-clone-initialization.phpt b/tests/compiler/object_property/readonly-clone-initialization.phpt
index a2c86bfd..3286cc1e 100644
--- a/tests/compiler/object_property/readonly-clone-initialization.phpt
+++ b/tests/compiler/object_property/readonly-clone-initialization.phpt
@@ -3,8 +3,6 @@ readonly properties may be reinitialized once while cloning
 --FILE--
 <?php
 
-use native_types;
-
 class ReadonlyCloneBase
 {
     public readonly int $base;
diff --git a/tests/compiler/object_property/readonly-cross-class-direct.phpt b/tests/compiler/object_property/readonly-cross-class-direct.phpt
index c6d95245..2df4ec9b 100644
--- a/tests/compiler/object_property/readonly-cross-class-direct.phpt
+++ b/tests/compiler/object_property/readonly-cross-class-direct.phpt
@@ -3,8 +3,6 @@ Readonly native properties remain initialized when read across classes
 --FILE--
 <?php
 
-use native_types;
-
 class ReadonlyDimensions
 {
     public readonly int $x;
diff --git a/tests/compiler/operator/assign-op-mixed-types.phpt b/tests/compiler/operator/assign-op-mixed-types.phpt
index 6553aa66..872ea2b7 100644
--- a/tests/compiler/operator/assign-op-mixed-types.phpt
+++ b/tests/compiler/operator/assign-op-mixed-types.phpt
@@ -3,9 +3,11 @@ Compound assignment operators with mixed Var/explicit std native types
 --FILE--
 <?php
 
+use varint_types;
+
 function main() {
     // ===== Var += various RHS types =====
-    // Var += Int (no native types — Var operator should handle coercion)
+    // Var += Int (varint_types — Var operator should handle coercion)
     $a = 10;
     $a += 5;
     var_dump($a);
@@ -40,7 +42,7 @@ function main() {
     $g %= 3;
     var_dump($g);
 
-    // ===== Explicit std::* native types without use native_types =====
+    // ===== Explicit std::* native types inside varint_types =====
     // Int += Int
     $h = std::int(100);
     $h += 50;
diff --git a/tests/compiler/operator/constant-int-arithmetic-overflow.phpt b/tests/compiler/operator/constant-int-arithmetic-overflow.phpt
index 79b6d8c1..efee3517 100644
--- a/tests/compiler/operator/constant-int-arithmetic-overflow.phpt
+++ b/tests/compiler/operator/constant-int-arithmetic-overflow.phpt
@@ -3,6 +3,7 @@ Constant integer arithmetic overflow promotes to float like PHP
 --FILE--
 <?php
 declare(strict_types=1);
+use varint_types;
 
 function overflowInferred()
 {
diff --git a/tests/compiler/operator/local-var-compound-overflow.phpt b/tests/compiler/operator/local-var-compound-overflow.phpt
index d76e2804..701db31c 100644
--- a/tests/compiler/operator/local-var-compound-overflow.phpt
+++ b/tests/compiler/operator/local-var-compound-overflow.phpt
@@ -2,6 +2,7 @@
 Dynamic local compound assignment preserves PHP integer overflow promotion
 --FILE--
 <?php
+use varint_types;
 function main(): void {
     $add = PHP_INT_MAX;
     $add += 1;
diff --git a/tests/compiler/operator/runtime-int-division.phpt b/tests/compiler/operator/runtime-int-division.phpt
index 079adecb..06c9e972 100644
--- a/tests/compiler/operator/runtime-int-division.phpt
+++ b/tests/compiler/operator/runtime-int-division.phpt
@@ -3,6 +3,7 @@ Runtime int division preserves PHP exact, fractional, overflow and zero-divisor
 --FILE--
 <?php
 declare(strict_types=1);
+use varint_types;
 
 function divide(int $left, int $right): mixed
 {
diff --git a/tests/compiler/operator/runtime-int-overflow-return.phpt b/tests/compiler/operator/runtime-int-overflow-return.phpt
index 55a5404c..0d439f81 100644
--- a/tests/compiler/operator/runtime-int-overflow-return.phpt
+++ b/tests/compiler/operator/runtime-int-overflow-return.phpt
@@ -3,6 +3,7 @@ Runtime integer overflow is checked at an int return boundary
 --FILE--
 <?php
 declare(strict_types=1);
+use varint_types;
 
 final class OverflowProperties
 {
diff --git a/tests/compiler/operator/typed-int-float-division.phpt b/tests/compiler/operator/typed-int-float-division.phpt
index 872ab2f4..6e94b62f 100644
--- a/tests/compiler/operator/typed-int-float-division.phpt
+++ b/tests/compiler/operator/typed-int-float-division.phpt
@@ -3,6 +3,7 @@ Typed int and float division follows PHP semantics (fractional result, DivisionB
 --FILE--
 <?php
 declare(strict_types=1);
+use varint_types;
 
 function divInts(int $a, int $b): float
 {
diff --git a/tests/compiler/optimizations/int-narrow-overflow.phpt b/tests/compiler/optimizations/int-narrow-overflow.phpt
index f04191dc..d9559aed 100644
--- a/tests/compiler/optimizations/int-narrow-overflow.phpt
+++ b/tests/compiler/optimizations/int-narrow-overflow.phpt
@@ -2,6 +2,7 @@
 SSA narrowing: int overflow prevention (PHP_INT_MAX)
 --FILE--
 <?php
+use varint_types;
 function main(): void {
     $a = 2;
 
diff --git a/tests/compiler/optimizations/loop-var-overflow-semantics.phpt b/tests/compiler/optimizations/loop-var-overflow-semantics.phpt
index 738c22c3..973c0718 100644
--- a/tests/compiler/optimizations/loop-var-overflow-semantics.phpt
+++ b/tests/compiler/optimizations/loop-var-overflow-semantics.phpt
@@ -1,7 +1,8 @@
 --TEST--
-Loop var optimizer preserves PHP overflow-to-float semantics without native_types
+Loop var optimizer preserves PHP overflow-to-float semantics with varint_types
 --FILE--
 <?php
+use varint_types;
 function main(): void {
     $value = 0;
 
diff --git a/tests/compiler/optimizations/narrow-div-pow.phpt b/tests/compiler/optimizations/narrow-div-pow.phpt
index 2155915f..07dd9fe7 100644
--- a/tests/compiler/optimizations/narrow-div-pow.phpt
+++ b/tests/compiler/optimizations/narrow-div-pow.phpt
@@ -2,6 +2,7 @@
 SSA narrowing: division and pow compound-assign prevent int narrowing
 --FILE--
 <?php
+use varint_types;
 function main(): void {
     // /= prevents int narrowing → $a stays Var (float result in PHP)
     $a = 10;
diff --git a/tests/compiler/optimizations/object-int-prop-02.phpt b/tests/compiler/optimizations/object-int-prop-02.phpt
index 6634adc7..592f231c 100644
--- a/tests/compiler/optimizations/object-int-prop-02.phpt
+++ b/tests/compiler/optimizations/object-int-prop-02.phpt
@@ -2,10 +2,8 @@
 SSA: int
 --FILE--
 <?php
-use native_types;
 class Foo {
     public int $b;
-
     function assign_add_prop($n) {
         for ($i = 0; $i < $n; ++$i) {
             $this->b += 2;
@@ -19,4 +17,4 @@ function main(): void {
 }
 ?>
 --EXPECT--
-int(200000)
\ No newline at end of file
+int(200000)
diff --git a/tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt b/tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt
index 9388a125..b0569fd8 100644
--- a/tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-array-var-ref.phpt
@@ -2,8 +2,6 @@
 SSA object prop: hoist array property through indirect Var handle
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public array $items = [];
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-float.phpt b/tests/compiler/optimizations/objprop-hoist-float.phpt
index a17c8337..873a4f11 100644
--- a/tests/compiler/optimizations/objprop-hoist-float.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-float.phpt
@@ -2,14 +2,12 @@
 SSA object prop: hoist float property to reference (NativeTypes)
 --FILE--
 <?php
-use native_types;
 class Foo {
     public float $a;
 }
 function main(): void {
     $o = new Foo();
     $o->a = 1.5;
-
     $n = 1024;
     while($n--) {
         $o->a += 0.5;
diff --git a/tests/compiler/optimizations/objprop-hoist-int.phpt b/tests/compiler/optimizations/objprop-hoist-int.phpt
index 7aa77260..eb50f15f 100644
--- a/tests/compiler/optimizations/objprop-hoist-int.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-int.phpt
@@ -2,14 +2,12 @@
 SSA object prop: hoist int property to reference (NativeTypes)
 --FILE--
 <?php
-use native_types;
 class Foo {
     public int $a;
 }
 function main(): void {
     $o = new Foo();
     $o->a = 12;
-
     $n = 1024;
     while($n--) {
         $o->a += 13;
diff --git a/tests/compiler/optimizations/objprop-hoist-loop-redef.phpt b/tests/compiler/optimizations/objprop-hoist-loop-redef.phpt
index 2acadb58..21963241 100644
--- a/tests/compiler/optimizations/objprop-hoist-loop-redef.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-loop-redef.phpt
@@ -2,8 +2,6 @@
 SSA object prop: loop body object redefinition prevents hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a;
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-magic.phpt b/tests/compiler/optimizations/objprop-hoist-magic.phpt
index 90e07d78..8cc6a935 100644
--- a/tests/compiler/optimizations/objprop-hoist-magic.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-magic.phpt
@@ -2,7 +2,6 @@
 SSA object prop: __get/__set magic methods prevent hoisting
 --FILE--
 <?php
-use native_types;
 class Foo {
     public int $a;
     public function __get($name) { return $this->$name; }
@@ -11,7 +10,6 @@ class Foo {
 function main(): void {
     $o = new Foo();
     $o->a = 10;
-
     $n = 5;
     while($n--) {
         $o->a += 2;
diff --git a/tests/compiler/optimizations/objprop-hoist-multi-def.phpt b/tests/compiler/optimizations/objprop-hoist-multi-def.phpt
index 86196421..d243dde7 100644
--- a/tests/compiler/optimizations/objprop-hoist-multi-def.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-multi-def.phpt
@@ -2,7 +2,6 @@
 SSA object prop: multiple definitions prevent hoisting
 --FILE--
 <?php
-use native_types;
 class Foo {
     public int $a;
 }
@@ -11,7 +10,6 @@ function main(): void {
     $o->a = 100;
     $o = new Foo();
     $o->a = 200;
-
     $n = 10;
     while($n--) {
         $o->a += 5;
diff --git a/tests/compiler/optimizations/objprop-hoist-nested-std-ref.phpt b/tests/compiler/optimizations/objprop-hoist-nested-std-ref.phpt
index ea3ea55b..2fabaaec 100644
--- a/tests/compiler/optimizations/objprop-hoist-nested-std-ref.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-nested-std-ref.phpt
@@ -2,8 +2,6 @@
 SSA object prop: nested std::ref property use prevents hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a;
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt b/tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt
index 114512b1..67c08530 100644
--- a/tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-object-alias-escape.phpt
@@ -2,8 +2,6 @@
 SSA object prop: object alias escape prevents property hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a;
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt b/tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt
index b57026c4..b6432488 100644
--- a/tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-object-arg-escape.phpt
@@ -2,8 +2,6 @@
 SSA object prop: object argument escape prevents property hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a;
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt b/tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt
index e39e00bf..298f53e3 100644
--- a/tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-object-arg-reference-slot.phpt
@@ -2,8 +2,6 @@
 SSA object prop: object argument can turn property slot into reference
 --FILE--
 <?php
-use native_types;
-
 class RefSlotFoo {
     public int $a;
 }
diff --git a/tests/compiler/optimizations/objprop-hoist-ref-capture.phpt b/tests/compiler/optimizations/objprop-hoist-ref-capture.phpt
index d3429b90..157a7fc0 100644
--- a/tests/compiler/optimizations/objprop-hoist-ref-capture.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-ref-capture.phpt
@@ -2,14 +2,12 @@
 SSA object prop: reference capture of property prevents hoisting
 --FILE--
 <?php
-use native_types;
 class Foo {
     public int $a;
 }
 function main(): void {
     $o = new Foo();
     $o->a = 10;
-
     $ref = &$o->a;
     $ref = 20;
 
diff --git a/tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt b/tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt
index a28036fd..8540e552 100644
--- a/tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt
+++ b/tests/compiler/optimizations/objprop-hoist-this-object-arg-escape.phpt
@@ -2,8 +2,6 @@
 SSA object prop: this object argument escape prevents property hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a;
 
diff --git a/tests/compiler/optimizations/objprop-nullable-union-default-null.phpt b/tests/compiler/optimizations/objprop-nullable-union-default-null.phpt
index 7e3ac712..99cc9746 100644
--- a/tests/compiler/optimizations/objprop-nullable-union-default-null.phpt
+++ b/tests/compiler/optimizations/objprop-nullable-union-default-null.phpt
@@ -2,8 +2,6 @@
 SSA object prop: nullable and union properties stay Var with null default
 --FILE--
 <?php
-use native_types;
-
 class FlexibleDefaults {
     public ?int $nullable;
     public ?object $nullableObject;
diff --git a/tests/compiler/optimizations/objprop-typed-object-null-unset.phpt b/tests/compiler/optimizations/objprop-typed-object-null-unset.phpt
index 9dd18aaa..1408a74f 100644
--- a/tests/compiler/optimizations/objprop-typed-object-null-unset.phpt
+++ b/tests/compiler/optimizations/objprop-typed-object-null-unset.phpt
@@ -2,8 +2,6 @@
 SSA object prop: typed object property supports unset
 --FILE--
 <?php
-use native_types;
-
 class ObjPropValue {
     public function name(): string {
         return "value";
diff --git a/tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt b/tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt
index fd817471..6f47a707 100644
--- a/tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt
+++ b/tests/compiler/optimizations/objprop-unset-fixed-defaults.phpt
@@ -2,8 +2,6 @@
 SSA object prop: unset fixed typed properties restores declared defaults
 --FILE--
 <?php
-use native_types;
-
 class FixedDefaults {
     public int $i;
     public float $f;
diff --git a/tests/compiler/optimizations/objprop-unset-this-typed.phpt b/tests/compiler/optimizations/objprop-unset-this-typed.phpt
index 16a1051f..a70f9ff2 100644
--- a/tests/compiler/optimizations/objprop-unset-this-typed.phpt
+++ b/tests/compiler/optimizations/objprop-unset-this-typed.phpt
@@ -2,8 +2,6 @@
 SSA object prop: unset typed this property disables property slot hoisting
 --FILE--
 <?php
-use native_types;
-
 class Foo {
     public int $a = 7;
 
diff --git a/tests/compiler/static/static-prop-assign-ref-late-static-binding.phpt b/tests/compiler/static/static-prop-assign-ref-late-static-binding.phpt
index c2053e27..3f2fc268 100644
--- a/tests/compiler/static/static-prop-assign-ref-late-static-binding.phpt
+++ b/tests/compiler/static/static-prop-assign-ref-late-static-binding.phpt
@@ -2,8 +2,6 @@
 Assign by reference to late-static-bound property resolves to called class
 --FILE--
 <?php
-use native_types;
-
 class Base {
     protected static int $value = 1;
 
diff --git a/tests/compiler/static/static-prop-assign-ref-native.phpt b/tests/compiler/static/static-prop-assign-ref-native.phpt
index fb454e18..ee673da9 100644
--- a/tests/compiler/static/static-prop-assign-ref-native.phpt
+++ b/tests/compiler/static/static-prop-assign-ref-native.phpt
@@ -2,8 +2,6 @@
 Assign by reference to native typed static property (self / static / class name)
 --FILE--
 <?php
-use native_types;
-
 class Test
 {
     private static int $value = 123;
diff --git a/tests/compiler/static/static-prop-assign-ref-type-error.phpt b/tests/compiler/static/static-prop-assign-ref-type-error.phpt
index d1ccdc30..87667f7e 100644
--- a/tests/compiler/static/static-prop-assign-ref-type-error.phpt
+++ b/tests/compiler/static/static-prop-assign-ref-type-error.phpt
@@ -2,8 +2,6 @@
 Reference to a typed static property preserves its type constraint
 --FILE--
 <?php
-use native_types;
-
 class TypedStaticReference
 {
     public static int $value = 1;
diff --git a/tests/compiler/static/static-prop-dynamic-call-stable.phpt b/tests/compiler/static/static-prop-dynamic-call-stable.phpt
index 4af7f3d6..9666c145 100644
--- a/tests/compiler/static/static-prop-dynamic-call-stable.phpt
+++ b/tests/compiler/static/static-prop-dynamic-call-stable.phpt
@@ -2,8 +2,6 @@
 Static property local slots survive dynamic PHP calls
 --FILE--
 <?php
-use native_types;
-
 class StaticDynamicCallStable {
     public static int $i = 1;
     public static string $s = "seed";
diff --git a/tests/compiler/static/static-prop-late-static-binding.phpt b/tests/compiler/static/static-prop-late-static-binding.phpt
index 573bdfa3..f6122f65 100644
--- a/tests/compiler/static/static-prop-late-static-binding.phpt
+++ b/tests/compiler/static/static-prop-late-static-binding.phpt
@@ -2,8 +2,6 @@
 Static native properties use late static binding for static::$prop
 --FILE--
 <?php
-use native_types;
-
 class StaticPropBase {
     public static int $v = 1;
 
diff --git a/tests/compiler/static/static-prop-native-defaults.phpt b/tests/compiler/static/static-prop-native-defaults.phpt
index e5f8c404..aed15347 100644
--- a/tests/compiler/static/static-prop-native-defaults.phpt
+++ b/tests/compiler/static/static-prop-native-defaults.phpt
@@ -2,8 +2,6 @@
 Static properties with native_types keep defaults and local slots
 --FILE--
 <?php
-use native_types;
-
 class StaticNativeDefaults {
     public static int $i = 42;
     public static float $f = 3.5;
diff --git a/tests/compiler/static/static-prop-ref-slot-crash.phpt b/tests/compiler/static/static-prop-ref-slot-crash.phpt
index e5ac68e3..43af5833 100644
--- a/tests/compiler/static/static-prop-ref-slot-crash.phpt
+++ b/tests/compiler/static/static-prop-ref-slot-crash.phpt
@@ -2,8 +2,6 @@
 Static property native slot becomes invalid after dynamic reference binding
 --FILE--
 <?php
-use native_types;
-
 class StaticRefSlotCrash {
     public static int $i = 1;
 }
diff --git a/tests/compiler/static/static-prop-ref-slot-float-crash.phpt b/tests/compiler/static/static-prop-ref-slot-float-crash.phpt
index ec5eb78c..9393a989 100644
--- a/tests/compiler/static/static-prop-ref-slot-float-crash.phpt
+++ b/tests/compiler/static/static-prop-ref-slot-float-crash.phpt
@@ -2,8 +2,6 @@
 Static float property native slot becomes invalid after dynamic reference binding
 --FILE--
 <?php
-use native_types;
-
 class StaticFloatRefSlotCrash {
     public static float $f = 1.5;
 }
diff --git a/tests/compiler/std-vector/013.phpt b/tests/compiler/std-vector/013.phpt
index dc5ff465..216caee4 100644
--- a/tests/compiler/std-vector/013.phpt
+++ b/tests/compiler/std-vector/013.phpt
@@ -2,7 +2,6 @@
 std vector: foreach
 --FILE--
 <?php
-use native_types;
 function main() {
     $a = std::vector(Type::Int);
     $n = 5;
diff --git a/tests/compiler/type_decl/is-null-native-scalar.phpt b/tests/compiler/type_decl/is-null-native-scalar.phpt
index 4e936d8e..21f9a610 100644
--- a/tests/compiler/type_decl/is-null-native-scalar.phpt
+++ b/tests/compiler/type_decl/is-null-native-scalar.phpt
@@ -3,8 +3,6 @@ is_null returns false for fixed native scalars and preserves operand side effect
 --FILE--
 <?php
 
-use native_types;
-
 function checkInt(int $value): bool
 {
     return is_null($value);
diff --git a/tests/compiler/universal_method/object_extension.phpt b/tests/compiler/universal_method/object_extension.phpt
index 382b9688..cf11d2cd 100644
--- a/tests/compiler/universal_method/object_extension.phpt
+++ b/tests/compiler/universal_method/object_extension.phpt
@@ -2,9 +2,7 @@
 Namespaced object methods use a MethodsFor class
 --FILE--
 <?php
-
 namespace App {
-    use native_types;
 
     class User
     {
diff --git a/tests/compiler/universal_method/object_extension_exact_name.phpt b/tests/compiler/universal_method/object_extension_exact_name.phpt
index e1b8b92f..56456930 100644
--- a/tests/compiler/universal_method/object_extension_exact_name.phpt
+++ b/tests/compiler/universal_method/object_extension_exact_name.phpt
@@ -2,9 +2,7 @@
 Object MethodsFor methods require consistent names and ignore letter case
 --FILE--
 <?php
-
 namespace App {
-    use native_types;
 
     class UserService
     {
diff --git a/tests/compiler/universal_method/universal_method_call.phpt b/tests/compiler/universal_method/universal_method_call.phpt
index 00d4d0ea..8bb65b7c 100644
--- a/tests/compiler/universal_method/universal_method_call.phpt
+++ b/tests/compiler/universal_method/universal_method_call.phpt
@@ -2,8 +2,6 @@
 Universal method call on native typed variables
 --FILE--
 <?php
-use native_types;
-
 function main()
 {
     // Int methods
diff --git a/tests/compiler/universal_method/universal_method_extension.phpt b/tests/compiler/universal_method/universal_method_extension.phpt
index 6cf9436d..439f18b7 100644
--- a/tests/compiler/universal_method/universal_method_extension.phpt
+++ b/tests/compiler/universal_method/universal_method_extension.phpt
@@ -3,8 +3,6 @@ Universal methods provided by MethodsFor classes
 --FILE--
 <?php
 
-use native_types;
-
 #[MethodsFor(Type::Int)]
 final class IntExtensions
 {
diff --git a/tests/compiler/universal_method/universal_method_extension_camel.phpt b/tests/compiler/universal_method/universal_method_extension_camel.phpt
index da38380b..a0457373 100644
--- a/tests/compiler/universal_method/universal_method_extension_camel.phpt
+++ b/tests/compiler/universal_method/universal_method_extension_camel.phpt
@@ -3,8 +3,6 @@ Universal MethodsFor methods use their declared names
 --FILE--
 <?php
 
-use native_types;
-
 #[MethodsFor(Type::Int)]
 final class IntExtensions
 {
diff --git a/tests/compiler/universal_method/universal_method_extension_chain.phpt b/tests/compiler/universal_method/universal_method_extension_chain.phpt
index 57ebd89c..d5f8de9a 100644
--- a/tests/compiler/universal_method/universal_method_extension_chain.phpt
+++ b/tests/compiler/universal_method/universal_method_extension_chain.phpt
@@ -3,8 +3,6 @@ MethodsFor method chaining with typed returns
 --FILE--
 <?php
 
-use native_types;
-
 #[MethodsFor(Type::Int)]
 final class IntExtensions
 {
diff --git a/tests/compiler/universal_method/universal_method_internal.phpt b/tests/compiler/universal_method/universal_method_internal.phpt
index f5070bad..f1782199 100644
--- a/tests/compiler/universal_method/universal_method_internal.phpt
+++ b/tests/compiler/universal_method/universal_method_internal.phpt
@@ -3,8 +3,6 @@ Universal method provider may wrap a PHP internal function
 --FILE--
 <?php
 
-use native_types;
-
 #[MethodsFor(Type::String)]
 final class StringExtensions
 {
diff --git a/tests/compiler/var_convert/001.phpt b/tests/compiler/var_convert/001.phpt
index 5f5893f4..93404282 100644
--- a/tests/compiler/var_convert/001.phpt
+++ b/tests/compiler/var_convert/001.phpt
@@ -2,14 +2,12 @@
 var convert chained on array element
 --FILE--
 <?php
-use native_types;
 function main()
 {
     $arr = [];
     $name = "hello";
     $arr["name"] = $name;
     $arr["age"] = 20;
-
     var_dump($arr["age"]->toString());
     var_dump($arr["name"]->toString());
 }
diff --git a/tests/wasm/runtime/phpx-numeric-containers.phpt b/tests/wasm/runtime/phpx-numeric-containers.phpt
index c63d4b77..b8a5bc7f 100644
--- a/tests/wasm/runtime/phpx-numeric-containers.phpt
+++ b/tests/wasm/runtime/phpx-numeric-containers.phpt
@@ -2,8 +2,6 @@
 WASM PHPX archive links high precision types and std containers
 --FILE--
 <?php
-use native_types;
-
 function main(): void
 {
     $integer = std::bigInt('12345678901234567890');