diff --git a/regression-tests/test-results/mixed-initialization-safety-3.cpp b/regression-tests/test-results/mixed-initialization-safety-3.cpp
index 1755e16a0..568830922 100644
--- a/regression-tests/test-results/mixed-initialization-safety-3.cpp
+++ b/regression-tests/test-results/mixed-initialization-safety-3.cpp
@@ -68,5 +68,5 @@ auto print_decorated(auto const& x) -> void{
 }
 
 #line 32 "mixed-initialization-safety-3.cpp2"
-[[nodiscard]] auto flip_a_coin() -> bool { return std::mt19937()() % 2 == 0;  }
+[[nodiscard]] auto flip_a_coin() -> bool { return std::mt19937()() % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF(std::mt19937()()),2) == 0;  }
 
diff --git a/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp b/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp
index 507220822..815ce90c5 100644
--- a/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp
+++ b/regression-tests/test-results/mixed-parameter-passing-with-forward.cpp
@@ -56,7 +56,7 @@ requires (std::is_convertible_v<CPP2_TYPEOF(e), std::add_const_t<std::string>&>)
     ++z;
     b += "plugh";
 
-    if (std::rand() % 2) {
+    if (std::rand() % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF(std::rand()),2)) {
         ++z;
         copy_from(cpp2::move(b));// definite last use
     }
@@ -71,7 +71,7 @@ requires (std::is_convertible_v<CPP2_TYPEOF(e), std::add_const_t<std::string>&>)
 
     copy_from(z);
 
-    if (std::time(nullptr) % 2 == 0) {
+    if (std::time(nullptr) % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF(std::time(nullptr)),2) == 0) {
         copy_from(cpp2::move(z));
     }
 
diff --git a/regression-tests/test-results/mixed-parameter-passing.cpp b/regression-tests/test-results/mixed-parameter-passing.cpp
index df0357680..138eb8993 100644
--- a/regression-tests/test-results/mixed-parameter-passing.cpp
+++ b/regression-tests/test-results/mixed-parameter-passing.cpp
@@ -69,7 +69,7 @@ auto parameter_styles(
     ++z;
     b += "plugh";
 
-    if (std::rand() % 2) {
+    if (std::rand() % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF(std::rand()),2)) {
         ++z;
         copy_from(cpp2::move(b));// definite last use
     }
@@ -83,7 +83,7 @@ auto parameter_styles(
 
     copy_from(z);
 
-    if (std::time(nullptr) % 2 == 0) {
+    if (std::time(nullptr) % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF(std::time(nullptr)),2) == 0) {
         copy_from(cpp2::move(z));
     }
 
diff --git a/regression-tests/test-results/pure2-assert-expected-not-null.cpp b/regression-tests/test-results/pure2-assert-expected-not-null.cpp
index 9f6acff70..a76a181e9 100644
--- a/regression-tests/test-results/pure2-assert-expected-not-null.cpp
+++ b/regression-tests/test-results/pure2-assert-expected-not-null.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-assert-optional-not-null.cpp b/regression-tests/test-results/pure2-assert-optional-not-null.cpp
index 5b3afce33..656d4f62c 100644
--- a/regression-tests/test-results/pure2-assert-optional-not-null.cpp
+++ b/regression-tests/test-results/pure2-assert-optional-not-null.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-assert-shared-ptr-not-null.cpp b/regression-tests/test-results/pure2-assert-shared-ptr-not-null.cpp
index 9f78b9db7..742a8b858 100644
--- a/regression-tests/test-results/pure2-assert-shared-ptr-not-null.cpp
+++ b/regression-tests/test-results/pure2-assert-shared-ptr-not-null.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-assert-unique-ptr-not-null.cpp b/regression-tests/test-results/pure2-assert-unique-ptr-not-null.cpp
index 2446af71d..9d5c2501a 100644
--- a/regression-tests/test-results/pure2-assert-unique-ptr-not-null.cpp
+++ b/regression-tests/test-results/pure2-assert-unique-ptr-not-null.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bounds-safety-span.cpp b/regression-tests/test-results/pure2-bounds-safety-span.cpp
index 374f11039..ce2ce82c0 100644
--- a/regression-tests/test-results/pure2-bounds-safety-span.cpp
+++ b/regression-tests/test-results/pure2-bounds-safety-span.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-break-continue.cpp b/regression-tests/test-results/pure2-break-continue.cpp
index ca21a0fc7..34307f93f 100644
--- a/regression-tests/test-results/pure2-break-continue.cpp
+++ b/regression-tests/test-results/pure2-break-continue.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
index 719ee11c5..60e0b0a04 100644
--- a/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-discard-precedence.cpp b/regression-tests/test-results/pure2-bugfix-for-discard-precedence.cpp
index 553c507e3..be8f9eeb1 100644
--- a/regression-tests/test-results/pure2-bugfix-for-discard-precedence.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-discard-precedence.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-indexed-call.cpp b/regression-tests/test-results/pure2-bugfix-for-indexed-call.cpp
index 1e837c7d3..9bd00102b 100644
--- a/regression-tests/test-results/pure2-bugfix-for-indexed-call.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-indexed-call.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-late-comments.cpp b/regression-tests/test-results/pure2-bugfix-for-late-comments.cpp
index 2bc53bab1..0c9eb14ca 100644
--- a/regression-tests/test-results/pure2-bugfix-for-late-comments.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-late-comments.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-max-munch.cpp b/regression-tests/test-results/pure2-bugfix-for-max-munch.cpp
index 5aa5f239f..9f7ad7650 100644
--- a/regression-tests/test-results/pure2-bugfix-for-max-munch.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-max-munch.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-memberwise-base-assignment.cpp b/regression-tests/test-results/pure2-bugfix-for-memberwise-base-assignment.cpp
index b91ebec34..0a45032fe 100644
--- a/regression-tests/test-results/pure2-bugfix-for-memberwise-base-assignment.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-memberwise-base-assignment.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-name-lookup-and-value-decoration.cpp b/regression-tests/test-results/pure2-bugfix-for-name-lookup-and-value-decoration.cpp
index 983f2e839..58b5d88cb 100644
--- a/regression-tests/test-results/pure2-bugfix-for-name-lookup-and-value-decoration.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-name-lookup-and-value-decoration.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-non-local-function-expression.cpp b/regression-tests/test-results/pure2-bugfix-for-non-local-function-expression.cpp
index f7bf2d3d3..d4296214b 100644
--- a/regression-tests/test-results/pure2-bugfix-for-non-local-function-expression.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-non-local-function-expression.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-non-local-initialization.cpp b/regression-tests/test-results/pure2-bugfix-for-non-local-initialization.cpp
index 2b27f9481..2cceaf6f0 100644
--- a/regression-tests/test-results/pure2-bugfix-for-non-local-initialization.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-non-local-initialization.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-optional-template-argument-list.cpp b/regression-tests/test-results/pure2-bugfix-for-optional-template-argument-list.cpp
index 93aa8dafe..0b9b9f519 100644
--- a/regression-tests/test-results/pure2-bugfix-for-optional-template-argument-list.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-optional-template-argument-list.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp b/regression-tests/test-results/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp
index 840ae9d29..f0f1445bd 100644
--- a/regression-tests/test-results/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-requires-clause-in-forward-declaration.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp b/regression-tests/test-results/pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp
index 4826776a3..2e7e256e8 100644
--- a/regression-tests/test-results/pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-requires-clause-unbraced-function-initializer.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-template-argument.cpp b/regression-tests/test-results/pure2-bugfix-for-template-argument.cpp
index 1b0f4c2a7..8c47d4aa5 100644
--- a/regression-tests/test-results/pure2-bugfix-for-template-argument.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-template-argument.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp
index 9777e04bb..8145fae4c 100644
--- a/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-ufcs-arguments.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-name-lookup.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-name-lookup.cpp
index ae5a4442e..bcaa8c241 100644
--- a/regression-tests/test-results/pure2-bugfix-for-ufcs-name-lookup.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-ufcs-name-lookup.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp
index 4d31faf29..a3425a914 100644
--- a/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-ufcs-noexcept.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-ufcs-sfinae.cpp b/regression-tests/test-results/pure2-bugfix-for-ufcs-sfinae.cpp
index a6ea35ca8..158ff789f 100644
--- a/regression-tests/test-results/pure2-bugfix-for-ufcs-sfinae.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-ufcs-sfinae.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-unbraced-function-expression.cpp b/regression-tests/test-results/pure2-bugfix-for-unbraced-function-expression.cpp
index 33e705a4e..1b8019dc0 100644
--- a/regression-tests/test-results/pure2-bugfix-for-unbraced-function-expression.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-unbraced-function-expression.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-bugfix-for-variable-template.cpp b/regression-tests/test-results/pure2-bugfix-for-variable-template.cpp
index 7b8d7f07b..71f3ced75 100644
--- a/regression-tests/test-results/pure2-bugfix-for-variable-template.cpp
+++ b/regression-tests/test-results/pure2-bugfix-for-variable-template.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-chained-comparisons.cpp b/regression-tests/test-results/pure2-chained-comparisons.cpp
index 5b1367026..837d175f8 100644
--- a/regression-tests/test-results/pure2-chained-comparisons.cpp
+++ b/regression-tests/test-results/pure2-chained-comparisons.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-concept-definition.cpp b/regression-tests/test-results/pure2-concept-definition.cpp
index b4222a5da..3e47e41f4 100644
--- a/regression-tests/test-results/pure2-concept-definition.cpp
+++ b/regression-tests/test-results/pure2-concept-definition.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-contracts.cpp b/regression-tests/test-results/pure2-contracts.cpp
index 43a9f7bfe..02240ec56 100644
--- a/regression-tests/test-results/pure2-contracts.cpp
+++ b/regression-tests/test-results/pure2-contracts.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-default-arguments.cpp b/regression-tests/test-results/pure2-default-arguments.cpp
index e7a5471f8..16575d90f 100644
--- a/regression-tests/test-results/pure2-default-arguments.cpp
+++ b/regression-tests/test-results/pure2-default-arguments.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-defaulted-comparisons-and-final-types.cpp b/regression-tests/test-results/pure2-defaulted-comparisons-and-final-types.cpp
index 12b70a852..f5c443d21 100644
--- a/regression-tests/test-results/pure2-defaulted-comparisons-and-final-types.cpp
+++ b/regression-tests/test-results/pure2-defaulted-comparisons-and-final-types.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-enum.cpp b/regression-tests/test-results/pure2-enum.cpp
index f25966d1e..f1dd40d46 100644
--- a/regression-tests/test-results/pure2-enum.cpp
+++ b/regression-tests/test-results/pure2-enum.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-expected-is-as.cpp b/regression-tests/test-results/pure2-expected-is-as.cpp
index 956d9547e..be0cb2dd0 100644
--- a/regression-tests/test-results/pure2-expected-is-as.cpp
+++ b/regression-tests/test-results/pure2-expected-is-as.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-for-loop-range-with-lambda.cpp b/regression-tests/test-results/pure2-for-loop-range-with-lambda.cpp
index 1a1256651..c3dcb10a3 100644
--- a/regression-tests/test-results/pure2-for-loop-range-with-lambda.cpp
+++ b/regression-tests/test-results/pure2-for-loop-range-with-lambda.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-forward-return.cpp b/regression-tests/test-results/pure2-forward-return.cpp
index fdab13b7e..5923895b6 100644
--- a/regression-tests/test-results/pure2-forward-return.cpp
+++ b/regression-tests/test-results/pure2-forward-return.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-function-body-reflection.cpp b/regression-tests/test-results/pure2-function-body-reflection.cpp
index 8e43150b6..10d07250b 100644
--- a/regression-tests/test-results/pure2-function-body-reflection.cpp
+++ b/regression-tests/test-results/pure2-function-body-reflection.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-function-multiple-forward-arguments.cpp b/regression-tests/test-results/pure2-function-multiple-forward-arguments.cpp
index 6f87a1468..16843d01a 100644
--- a/regression-tests/test-results/pure2-function-multiple-forward-arguments.cpp
+++ b/regression-tests/test-results/pure2-function-multiple-forward-arguments.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-function-single-expression-body-default-return.cpp b/regression-tests/test-results/pure2-function-single-expression-body-default-return.cpp
index edf5d7e32..b02ad7218 100644
--- a/regression-tests/test-results/pure2-function-single-expression-body-default-return.cpp
+++ b/regression-tests/test-results/pure2-function-single-expression-body-default-return.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-function-typeids.cpp b/regression-tests/test-results/pure2-function-typeids.cpp
index 4ebe848aa..fb07eb976 100644
--- a/regression-tests/test-results/pure2-function-typeids.cpp
+++ b/regression-tests/test-results/pure2-function-typeids.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-hashable.cpp b/regression-tests/test-results/pure2-hashable.cpp
index 008d74f8a..d5f974789 100644
--- a/regression-tests/test-results/pure2-hashable.cpp
+++ b/regression-tests/test-results/pure2-hashable.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-hello.cpp b/regression-tests/test-results/pure2-hello.cpp
index 0053377b5..ef15af4ee 100644
--- a/regression-tests/test-results/pure2-hello.cpp
+++ b/regression-tests/test-results/pure2-hello.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-initialization-safety-with-else-if.cpp b/regression-tests/test-results/pure2-initialization-safety-with-else-if.cpp
index 1e22c8840..7f1dc83f4 100644
--- a/regression-tests/test-results/pure2-initialization-safety-with-else-if.cpp
+++ b/regression-tests/test-results/pure2-initialization-safety-with-else-if.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp b/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp
index 5f4ae295a..0c564c2c5 100644
--- a/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp
+++ b/regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-inspect-expression-with-as-in-generic-function.cpp b/regression-tests/test-results/pure2-inspect-expression-with-as-in-generic-function.cpp
index 271d6136c..350876930 100644
--- a/regression-tests/test-results/pure2-inspect-expression-with-as-in-generic-function.cpp
+++ b/regression-tests/test-results/pure2-inspect-expression-with-as-in-generic-function.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-inspect-fallback-with-variant-any-optional.cpp b/regression-tests/test-results/pure2-inspect-fallback-with-variant-any-optional.cpp
index ec770fa2f..9bc4a384c 100644
--- a/regression-tests/test-results/pure2-inspect-fallback-with-variant-any-optional.cpp
+++ b/regression-tests/test-results/pure2-inspect-fallback-with-variant-any-optional.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-inspect-generic-void-empty-with-variant-any-optional.cpp b/regression-tests/test-results/pure2-inspect-generic-void-empty-with-variant-any-optional.cpp
index b20fb2758..b57e6acde 100644
--- a/regression-tests/test-results/pure2-inspect-generic-void-empty-with-variant-any-optional.cpp
+++ b/regression-tests/test-results/pure2-inspect-generic-void-empty-with-variant-any-optional.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-interpolation.cpp b/regression-tests/test-results/pure2-interpolation.cpp
index 43d8237db..26f755477 100644
--- a/regression-tests/test-results/pure2-interpolation.cpp
+++ b/regression-tests/test-results/pure2-interpolation.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-intro-example-hello-2022.cpp b/regression-tests/test-results/pure2-intro-example-hello-2022.cpp
index ff3c60857..54e0e7595 100644
--- a/regression-tests/test-results/pure2-intro-example-hello-2022.cpp
+++ b/regression-tests/test-results/pure2-intro-example-hello-2022.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-intro-example-three-loops.cpp b/regression-tests/test-results/pure2-intro-example-three-loops.cpp
index 73c390f05..80fd135bc 100644
--- a/regression-tests/test-results/pure2-intro-example-three-loops.cpp
+++ b/regression-tests/test-results/pure2-intro-example-three-loops.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-is-with-free-functions-predicate.cpp b/regression-tests/test-results/pure2-is-with-free-functions-predicate.cpp
index f5c421830..d51922876 100644
--- a/regression-tests/test-results/pure2-is-with-free-functions-predicate.cpp
+++ b/regression-tests/test-results/pure2-is-with-free-functions-predicate.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-is-with-polymorphic-types.cpp b/regression-tests/test-results/pure2-is-with-polymorphic-types.cpp
index 25769c3bb..81b1b3c91 100644
--- a/regression-tests/test-results/pure2-is-with-polymorphic-types.cpp
+++ b/regression-tests/test-results/pure2-is-with-polymorphic-types.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-is-with-unnamed-predicates.cpp b/regression-tests/test-results/pure2-is-with-unnamed-predicates.cpp
index 4d8da75e4..63a5429b6 100644
--- a/regression-tests/test-results/pure2-is-with-unnamed-predicates.cpp
+++ b/regression-tests/test-results/pure2-is-with-unnamed-predicates.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-is-with-variable-and-value.cpp b/regression-tests/test-results/pure2-is-with-variable-and-value.cpp
index d19439ca0..a3cad94f4 100644
--- a/regression-tests/test-results/pure2-is-with-variable-and-value.cpp
+++ b/regression-tests/test-results/pure2-is-with-variable-and-value.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-last-use.cpp b/regression-tests/test-results/pure2-last-use.cpp
index 32bbed35e..f08a06d70 100644
--- a/regression-tests/test-results/pure2-last-use.cpp
+++ b/regression-tests/test-results/pure2-last-use.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp b/regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp
index e25c25173..a2d442297 100644
--- a/regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp
+++ b/regression-tests/test-results/pure2-look-up-parameter-across-unnamed-function.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-main-args.cpp b/regression-tests/test-results/pure2-main-args.cpp
index c4bee2076..06fb1e170 100644
--- a/regression-tests/test-results/pure2-main-args.cpp
+++ b/regression-tests/test-results/pure2-main-args.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-more-wildcards.cpp b/regression-tests/test-results/pure2-more-wildcards.cpp
index 4d01aba11..4d823038c 100644
--- a/regression-tests/test-results/pure2-more-wildcards.cpp
+++ b/regression-tests/test-results/pure2-more-wildcards.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-print.cpp b/regression-tests/test-results/pure2-print.cpp
index 7d2c1c86e..748f5e068 100644
--- a/regression-tests/test-results/pure2-print.cpp
+++ b/regression-tests/test-results/pure2-print.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
@@ -114,7 +114,7 @@ requires (true) inline CPP2_CONSTEXPR T outer::object_alias{ 42 };
             if (cpp2::impl::cmp_less(*cpp2::impl::assert_not_null(p),0)) {
                 ret = -*cpp2::impl::assert_not_null(cpp2::move(p));
             }
-            ret += strlen(s) - 10 + CPP2_UFCS(strlen)(s) * (16 / CPP2_ASSERT_NOT_ZERO(CPP2_TYPEOF(16),(3 & 2))) % 3;
+            ret += strlen(s) - 10 + CPP2_UFCS(strlen)(s) * (16 / CPP2_ASSERT_NOT_ZERO(CPP2_TYPEOF(16),(3 & 2))) % CPP2_ASSERT_NOT_ZERO_LITERAL(CPP2_TYPEOF((16 / CPP2_ASSERT_NOT_ZERO(CPP2_TYPEOF(16),(3 & 2)))),3);
 
             map<int const,string> m {}; 
             CPP2_ASSERT_IN_BOUNDS_LITERAL(m, 0) = cpp2::impl::as_<string>("har");
diff --git a/regression-tests/test-results/pure2-range-operators.cpp b/regression-tests/test-results/pure2-range-operators.cpp
index 53ef35a57..2df27e425 100644
--- a/regression-tests/test-results/pure2-range-operators.cpp
+++ b/regression-tests/test-results/pure2-range-operators.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-raw-string-literal-and-interpolation.cpp b/regression-tests/test-results/pure2-raw-string-literal-and-interpolation.cpp
index 63ce8c8d4..097052cdc 100644
--- a/regression-tests/test-results/pure2-raw-string-literal-and-interpolation.cpp
+++ b/regression-tests/test-results/pure2-raw-string-literal-and-interpolation.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-regex-general.cpp b/regression-tests/test-results/pure2-regex-general.cpp
index 599877fa1..81dac4196 100644
--- a/regression-tests/test-results/pure2-regex-general.cpp
+++ b/regression-tests/test-results/pure2-regex-general.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_01_char_matcher.cpp b/regression-tests/test-results/pure2-regex_01_char_matcher.cpp
index 24dd28b03..6d8e23e67 100644
--- a/regression-tests/test-results/pure2-regex_01_char_matcher.cpp
+++ b/regression-tests/test-results/pure2-regex_01_char_matcher.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_02_ranges.cpp b/regression-tests/test-results/pure2-regex_02_ranges.cpp
index 58a42c8bf..b2ef39e0d 100644
--- a/regression-tests/test-results/pure2-regex_02_ranges.cpp
+++ b/regression-tests/test-results/pure2-regex_02_ranges.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_03_wildcard.cpp b/regression-tests/test-results/pure2-regex_03_wildcard.cpp
index 81242ca0a..340e8a97a 100644
--- a/regression-tests/test-results/pure2-regex_03_wildcard.cpp
+++ b/regression-tests/test-results/pure2-regex_03_wildcard.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_04_start_end.cpp b/regression-tests/test-results/pure2-regex_04_start_end.cpp
index b5a44d69c..df0594e4d 100644
--- a/regression-tests/test-results/pure2-regex_04_start_end.cpp
+++ b/regression-tests/test-results/pure2-regex_04_start_end.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_05_classes.cpp b/regression-tests/test-results/pure2-regex_05_classes.cpp
index 9edb7b49b..7e0fb430a 100644
--- a/regression-tests/test-results/pure2-regex_05_classes.cpp
+++ b/regression-tests/test-results/pure2-regex_05_classes.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_06_boundaries.cpp b/regression-tests/test-results/pure2-regex_06_boundaries.cpp
index d3de466a0..700e1f9f1 100644
--- a/regression-tests/test-results/pure2-regex_06_boundaries.cpp
+++ b/regression-tests/test-results/pure2-regex_06_boundaries.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_07_short_classes.cpp b/regression-tests/test-results/pure2-regex_07_short_classes.cpp
index 5cc698ed3..29e44106b 100644
--- a/regression-tests/test-results/pure2-regex_07_short_classes.cpp
+++ b/regression-tests/test-results/pure2-regex_07_short_classes.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_08_alternatives.cpp b/regression-tests/test-results/pure2-regex_08_alternatives.cpp
index 2151ebbb5..769229c34 100644
--- a/regression-tests/test-results/pure2-regex_08_alternatives.cpp
+++ b/regression-tests/test-results/pure2-regex_08_alternatives.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_09_groups.cpp b/regression-tests/test-results/pure2-regex_09_groups.cpp
index 8a597554c..5e36105b1 100644
--- a/regression-tests/test-results/pure2-regex_09_groups.cpp
+++ b/regression-tests/test-results/pure2-regex_09_groups.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_10_escapes.cpp b/regression-tests/test-results/pure2-regex_10_escapes.cpp
index f45381a1c..803914851 100644
--- a/regression-tests/test-results/pure2-regex_10_escapes.cpp
+++ b/regression-tests/test-results/pure2-regex_10_escapes.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_11_group_references.cpp b/regression-tests/test-results/pure2-regex_11_group_references.cpp
index acc577c0a..a318ba529 100644
--- a/regression-tests/test-results/pure2-regex_11_group_references.cpp
+++ b/regression-tests/test-results/pure2-regex_11_group_references.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_12_case_insensitive.cpp b/regression-tests/test-results/pure2-regex_12_case_insensitive.cpp
index aab6c52a4..63017682f 100644
--- a/regression-tests/test-results/pure2-regex_12_case_insensitive.cpp
+++ b/regression-tests/test-results/pure2-regex_12_case_insensitive.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_13_possessive_modifier.cpp b/regression-tests/test-results/pure2-regex_13_possessive_modifier.cpp
index 5970247df..04dfdb81b 100644
--- a/regression-tests/test-results/pure2-regex_13_possessive_modifier.cpp
+++ b/regression-tests/test-results/pure2-regex_13_possessive_modifier.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_14_multiline_modifier.cpp b/regression-tests/test-results/pure2-regex_14_multiline_modifier.cpp
index 7fa940846..1e931fcf9 100644
--- a/regression-tests/test-results/pure2-regex_14_multiline_modifier.cpp
+++ b/regression-tests/test-results/pure2-regex_14_multiline_modifier.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_15_group_modifiers.cpp b/regression-tests/test-results/pure2-regex_15_group_modifiers.cpp
index 11bbf4276..b9dc88c42 100644
--- a/regression-tests/test-results/pure2-regex_15_group_modifiers.cpp
+++ b/regression-tests/test-results/pure2-regex_15_group_modifiers.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_16_perl_syntax_modifier.cpp b/regression-tests/test-results/pure2-regex_16_perl_syntax_modifier.cpp
index a545bf3c2..87039e725 100644
--- a/regression-tests/test-results/pure2-regex_16_perl_syntax_modifier.cpp
+++ b/regression-tests/test-results/pure2-regex_16_perl_syntax_modifier.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_17_comments.cpp b/regression-tests/test-results/pure2-regex_17_comments.cpp
index 86b981d5b..0827f1ac2 100644
--- a/regression-tests/test-results/pure2-regex_17_comments.cpp
+++ b/regression-tests/test-results/pure2-regex_17_comments.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_18_branch_reset.cpp b/regression-tests/test-results/pure2-regex_18_branch_reset.cpp
index 829d5278e..5b31337c1 100644
--- a/regression-tests/test-results/pure2-regex_18_branch_reset.cpp
+++ b/regression-tests/test-results/pure2-regex_18_branch_reset.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_19_lookahead.cpp b/regression-tests/test-results/pure2-regex_19_lookahead.cpp
index 26955d7e2..55ddbf187 100644
--- a/regression-tests/test-results/pure2-regex_19_lookahead.cpp
+++ b/regression-tests/test-results/pure2-regex_19_lookahead.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-regex_21_atomic_patterns.cpp b/regression-tests/test-results/pure2-regex_21_atomic_patterns.cpp
index f2a28f043..f61330a68 100644
--- a/regression-tests/test-results/pure2-regex_21_atomic_patterns.cpp
+++ b/regression-tests/test-results/pure2-regex_21_atomic_patterns.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 #include "cpp2regex.h"
 
 //=== Cpp2 type declarations ====================================================
diff --git a/regression-tests/test-results/pure2-repeated-call.cpp b/regression-tests/test-results/pure2-repeated-call.cpp
index ad4fbb72f..663ce6d9e 100644
--- a/regression-tests/test-results/pure2-repeated-call.cpp
+++ b/regression-tests/test-results/pure2-repeated-call.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-requires-clauses.cpp b/regression-tests/test-results/pure2-requires-clauses.cpp
index a83ef305d..7e6186fad 100644
--- a/regression-tests/test-results/pure2-requires-clauses.cpp
+++ b/regression-tests/test-results/pure2-requires-clauses.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-return-tuple-operator.cpp b/regression-tests/test-results/pure2-return-tuple-operator.cpp
index ef582774d..4c4aca902 100644
--- a/regression-tests/test-results/pure2-return-tuple-operator.cpp
+++ b/regression-tests/test-results/pure2-return-tuple-operator.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-statement-scope-parameters.cpp b/regression-tests/test-results/pure2-statement-scope-parameters.cpp
index d6bb0749b..e7ca46ad8 100644
--- a/regression-tests/test-results/pure2-statement-scope-parameters.cpp
+++ b/regression-tests/test-results/pure2-statement-scope-parameters.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-stdio-with-raii.cpp b/regression-tests/test-results/pure2-stdio-with-raii.cpp
index 6a035224b..1358d79b5 100644
--- a/regression-tests/test-results/pure2-stdio-with-raii.cpp
+++ b/regression-tests/test-results/pure2-stdio-with-raii.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-stdio.cpp b/regression-tests/test-results/pure2-stdio.cpp
index 2bf913629..b59d6c870 100644
--- a/regression-tests/test-results/pure2-stdio.cpp
+++ b/regression-tests/test-results/pure2-stdio.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-synthesize-rightshift-and-rightshifteq.cpp b/regression-tests/test-results/pure2-synthesize-rightshift-and-rightshifteq.cpp
index 5ab662004..f0e5b9f7d 100644
--- a/regression-tests/test-results/pure2-synthesize-rightshift-and-rightshifteq.cpp
+++ b/regression-tests/test-results/pure2-synthesize-rightshift-and-rightshifteq.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-template-parameter-lists.cpp b/regression-tests/test-results/pure2-template-parameter-lists.cpp
index 9756ee1bb..ede1f7cfa 100644
--- a/regression-tests/test-results/pure2-template-parameter-lists.cpp
+++ b/regression-tests/test-results/pure2-template-parameter-lists.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-trailing-comma-assert.cpp b/regression-tests/test-results/pure2-trailing-comma-assert.cpp
index 170c91887..8e17900e0 100644
--- a/regression-tests/test-results/pure2-trailing-comma-assert.cpp
+++ b/regression-tests/test-results/pure2-trailing-comma-assert.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-trailing-commas.cpp b/regression-tests/test-results/pure2-trailing-commas.cpp
index 28bd0df95..acaf2189c 100644
--- a/regression-tests/test-results/pure2-trailing-commas.cpp
+++ b/regression-tests/test-results/pure2-trailing-commas.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-type-and-namespace-aliases.cpp b/regression-tests/test-results/pure2-type-and-namespace-aliases.cpp
index 0e7860066..04832273d 100644
--- a/regression-tests/test-results/pure2-type-and-namespace-aliases.cpp
+++ b/regression-tests/test-results/pure2-type-and-namespace-aliases.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-type-constraints.cpp b/regression-tests/test-results/pure2-type-constraints.cpp
index fd9d7983c..41c8ce161 100644
--- a/regression-tests/test-results/pure2-type-constraints.cpp
+++ b/regression-tests/test-results/pure2-type-constraints.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-type-safety-1.cpp b/regression-tests/test-results/pure2-type-safety-1.cpp
index 870c97a38..9dc0491ab 100644
--- a/regression-tests/test-results/pure2-type-safety-1.cpp
+++ b/regression-tests/test-results/pure2-type-safety-1.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp b/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp
index 8cf6f953f..ed48e9387 100644
--- a/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp
+++ b/regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-basics.cpp b/regression-tests/test-results/pure2-types-basics.cpp
index c939baf06..96ac49b41 100644
--- a/regression-tests/test-results/pure2-types-basics.cpp
+++ b/regression-tests/test-results/pure2-types-basics.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-down-upcast.cpp b/regression-tests/test-results/pure2-types-down-upcast.cpp
index 34c06cd47..63310d140 100644
--- a/regression-tests/test-results/pure2-types-down-upcast.cpp
+++ b/regression-tests/test-results/pure2-types-down-upcast.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-inheritance.cpp b/regression-tests/test-results/pure2-types-inheritance.cpp
index 599681aa2..7895e2758 100644
--- a/regression-tests/test-results/pure2-types-inheritance.cpp
+++ b/regression-tests/test-results/pure2-types-inheritance.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp b/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp
index 98b955e2c..e53cb3cb3 100644
--- a/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp
+++ b/regression-tests/test-results/pure2-types-order-independence-and-nesting.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp b/regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp
index 4e87514f2..07e8bcefe 100644
--- a/regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp
+++ b/regression-tests/test-results/pure2-types-ordering-via-meta-functions.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp b/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
index 2424fe2c0..74f077bc7 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
index 274b123a9..b4c78f1b8 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
index bda6f192c..8d6983a55 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp b/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
index 278441771..52ad19df0 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp b/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
index d919e9f58..e784de106 100644
--- a/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
+++ b/regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-that-parameters.cpp b/regression-tests/test-results/pure2-types-that-parameters.cpp
index a84bf980c..c90007d41 100644
--- a/regression-tests/test-results/pure2-types-that-parameters.cpp
+++ b/regression-tests/test-results/pure2-types-that-parameters.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-types-value-types-via-meta-functions.cpp b/regression-tests/test-results/pure2-types-value-types-via-meta-functions.cpp
index b2e26aeb5..d1585f290 100644
--- a/regression-tests/test-results/pure2-types-value-types-via-meta-functions.cpp
+++ b/regression-tests/test-results/pure2-types-value-types-via-meta-functions.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp b/regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp
index 6e1e02d24..effd2b779 100644
--- a/regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp
+++ b/regression-tests/test-results/pure2-ufcs-member-access-and-chaining.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-union.cpp b/regression-tests/test-results/pure2-union.cpp
index 868997b28..f0733d2cb 100644
--- a/regression-tests/test-results/pure2-union.cpp
+++ b/regression-tests/test-results/pure2-union.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-unsafe.cpp b/regression-tests/test-results/pure2-unsafe.cpp
index 30c5a0a42..186516c4a 100644
--- a/regression-tests/test-results/pure2-unsafe.cpp
+++ b/regression-tests/test-results/pure2-unsafe.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-variadics.cpp b/regression-tests/test-results/pure2-variadics.cpp
index 7bfe69f2f..5da98bf6f 100644
--- a/regression-tests/test-results/pure2-variadics.cpp
+++ b/regression-tests/test-results/pure2-variadics.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/pure2-various-string-literals.cpp b/regression-tests/test-results/pure2-various-string-literals.cpp
index 2b4cc4762..c78dab3ee 100644
--- a/regression-tests/test-results/pure2-various-string-literals.cpp
+++ b/regression-tests/test-results/pure2-various-string-literals.cpp
@@ -1,5 +1,5 @@
 
-#define CPP2_IMPORT_STD          Yes
+#define CPP2_INCLUDE_STD         Yes
 
 //=== Cpp2 type declarations ====================================================
 
diff --git a/regression-tests/test-results/run-tests.bat b/regression-tests/test-results/run-tests.bat
index 9aa185ea7..cad32f839 100644
--- a/regression-tests/test-results/run-tests.bat
+++ b/regression-tests/test-results/run-tests.bat
@@ -14,7 +14,7 @@ for %%f in (mixed-*.cpp2) do (
 )
 for %%f in (pure2-*.cpp2) do (
     echo Starting cppfront.exe %%f -p
-    cppfront.exe -p %%f > %%f.output 2>&1
+    cppfront.exe -p -in %%f > %%f.output 2>&1
     del %%f
     set /a count+=1
 )
diff --git a/source/to_cpp1.h b/source/to_cpp1.h
index 6e0d02e56..70f550359 100644
--- a/source/to_cpp1.h
+++ b/source/to_cpp1.h
@@ -4109,6 +4109,8 @@ class cppfront
                         && (
                             x.op->type() == lexeme::Slash
                             || x.op->type() == lexeme::SlashEq
+                            || x.op->type() == lexeme::Modulo
+                            || x.op->type() == lexeme::ModuloEq
                             )
                         )
                     {