diff --git a/include/assert/assert.hpp b/include/assert/assert.hpp
index 1e3f9259..8834fd04 100644
--- a/include/assert/assert.hpp
+++ b/include/assert/assert.hpp
@@ -94,6 +94,14 @@
  #define LIBASSERT_GCC_ISNT_STUPID 1
 #endif
 
+#if LIBASSERT_IS_MSVC
+ #pragma warning(push)
+ // warning C4251: using non-dll-exported type in dll-exported type, firing on std::vector<frame_ptr> and others for some
+ // reason
+ // 4275 is the same thing but for base classes
+ #pragma warning(disable: 4251; disable: 4275)
+#endif
+
 namespace libassert {
     enum class assert_type {
         debug_assertion,
@@ -112,7 +120,7 @@ namespace libassert {
 #ifndef LIBASSERT_FAIL
  LIBASSERT_EXPORT
 #endif
-void LIBASSERT_FAIL(libassert::assert_type type, const libassert::assertion_printer& printer);
+LIBASSERT_EXPORT void LIBASSERT_FAIL(libassert::assert_type type, const libassert::assertion_printer& printer);
 
 // always_false is just convenient to use here
 #define LIBASSERT_PHONY_USE(E) ((void)libassert::detail::always_false<decltype(E)>)
@@ -183,7 +191,7 @@ namespace libassert::detail {
         opaque_trace& operator=(opaque_trace&&) = delete;
     };
 
-    opaque_trace get_stacktrace_opaque();
+    LIBASSERT_EXPORT opaque_trace get_stacktrace_opaque();
 
     /*
      * metaprogramming utilities
@@ -1137,6 +1145,10 @@ namespace libassert::detail {
     }
 }
 
+#if LIBASSERT_IS_MSVC
+ #pragma warning(pop)
+#endif
+
 inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
     // This non-constexpr method is called from an assertion in a constexpr context if a failure occurs. It is
     // intentionally a no-op.
@@ -1302,10 +1314,11 @@ inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
 // lambdas but that's potentially very expensive compile-time wise. Need to investigate further.
 // Note: libassert::detail::expression_decomposer(libassert::detail::expression_decomposer{} << expr) done for ternary
 #if LIBASSERT_IS_MSVC
- #define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{libassert_msvc_pfunc}
+ #define LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{libassert_msvc_pfunc}
 #else
- #define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
+ #define LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
 #endif
+#define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
 #if LIBASSERT_IS_CLANG // -Wall in clang
  #define LIBASSERT_IGNORE_UNUSED_VALUE _Pragma("GCC diagnostic ignored \"-Wunused-value\"")
 #else
@@ -1384,11 +1397,11 @@ inline void ERROR_ASSERTION_FAILURE_IN_CONSTEXPR_CONTEXT() {
               LIBASSERT_STATIC_DATA(name, libassert::assert_type::type, #expr, __VA_ARGS__) \
               if constexpr(sizeof libassert_decomposer > 32) { \
                 process_assert_fail(libassert_decomposer, libassert_params \
-                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_PRETTY_FUNCTION_ARG); \
+                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG); \
               } else { \
                 /* std::move it to assert_fail_m, will be moved back to r */ \
                 auto libassert_r = process_assert_fail_m(std::move(libassert_decomposer), libassert_params \
-                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_PRETTY_FUNCTION_ARG); \
+                                           LIBASSERT_VA_ARGS(__VA_ARGS__) LIBASSERT_INVOKE_VAL_PRETTY_FUNCTION_ARG); \
                 /* can't move-assign back to decomposer if it holds reference members */ \
                 LIBASSERT_DESTROY_DECOMPOSER; \
                 new (&libassert_decomposer) libassert::detail::expression_decomposer(std::move(libassert_r)); \
diff --git a/src/analysis.hpp b/src/analysis.hpp
index b7778fb6..24fc17a3 100644
--- a/src/analysis.hpp
+++ b/src/analysis.hpp
@@ -13,7 +13,7 @@ namespace libassert::detail {
         std::string content;
     };
 
-    LIBASSERT_ATTR_COLD
+    LIBASSERT_ATTR_COLD LIBASSERT_EXPORT /* FIXME */
     std::string highlight(const std::string& expression);
 
     LIBASSERT_ATTR_COLD
diff --git a/src/assert.cpp b/src/assert.cpp
index b782236f..8fc08a54 100644
--- a/src/assert.cpp
+++ b/src/assert.cpp
@@ -156,7 +156,7 @@ namespace libassert::detail {
      * system wrappers
      */
 
-    LIBASSERT_ATTR_COLD void enable_virtual_terminal_processing_if_needed() {
+    LIBASSERT_ATTR_COLD LIBASSERT_EXPORT void enable_virtual_terminal_processing_if_needed() {
         // enable colors / ansi processing if necessary
         #if IS_WINDOWS
          // https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#example-of-enabling-virtual-terminal-processing
diff --git a/tests/demo/demo.cpp b/tests/demo/demo.cpp
index e025f227..207e9081 100644
--- a/tests/demo/demo.cpp
+++ b/tests/demo/demo.cpp
@@ -390,7 +390,7 @@ class foo {
 };
 
 namespace libassert::detail {
-    void enable_virtual_terminal_processing_if_needed();
+    LIBASSERT_EXPORT void enable_virtual_terminal_processing_if_needed();
 }
 
 int main() {
diff --git a/tests/integration/expected/clang.txt b/tests/integration/expected/clang.txt
index 8eaa2da6..86884e82 100644
--- a/tests/integration/expected/clang.txt
+++ b/tests/integration/expected/clang.txt
@@ -1,5 +1,5 @@
 ===================== [value printing: strings] =====================
-Assertion failed at integration/integration.cpp:1103: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1103: void test_class<int>::something_else() [T = int]:
     debug_assert(s == "test");
     Where:
         s => "test\n"
@@ -13,7 +13,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1104: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1104: void test_class<int>::something_else() [T = int]:
     debug_assert(s[i] == 'c', ...);
     Where:
         s[i] => 't'
@@ -30,7 +30,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1107: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1107: void test_class<int>::something_else() [T = int]:
     debug_assert(buffer == thing);
     Where:
         buffer => char *: nullptr
@@ -45,7 +45,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1108: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1108: void test_class<int>::something_else() [T = int]:
     debug_assert(buffer == +thing);
     Where:
         buffer => char *: nullptr
@@ -60,7 +60,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1110: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1110: void test_class<int>::something_else() [T = int]:
     debug_assert(s == sv);
     Where:
         s  => "test\n"
@@ -76,7 +76,7 @@ Stack trace:
 
 
 ===================== [value printing: pointers] =====================
-Assertion failed at integration/integration.cpp:1201: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1201: void test_class<int>::something_else() [T = int]:
     debug_assert((uintptr_t)-1 == 0xff);
     Where:
         (uintptr_t)-1 =>  18446744073709551615  0xffffffffffffffff
@@ -91,7 +91,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1202: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1202: void test_class<int>::something_else() [T = int]:
     debug_assert((uintptr_t)-1 == (uintptr_t)0xff);
     Where:
         (uintptr_t)-1   => 18446744073709551615
@@ -106,7 +106,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1204: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1204: void test_class<int>::something_else() [T = int]:
     debug_assert(foo == nullptr);
     Where:
         foo => void *: 0xdeadbeef
@@ -121,7 +121,7 @@ Stack trace:
 
 
 ===================== [value printing: number formats] =====================
-Assertion failed at integration/integration.cpp:1303: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1303: void test_class<int>::something_else() [T = int]:
     debug_assert(mask bitand flags);
     Where:
         mask  =>  405  0b0000000110010101
@@ -136,7 +136,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1304: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1304: void test_class<int>::something_else() [T = int]:
     debug_assert(0xf == 16);
     Where:
         0xf =>  15  0xf
@@ -152,7 +152,7 @@ Stack trace:
 
 
 ===================== [value printing: floating point] =====================
-Assertion failed at integration/integration.cpp:1401: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1401: void test_class<int>::something_else() [T = int]:
     debug_assert(1 == 1.5);
 
 Stack trace:
@@ -164,7 +164,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1402: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1402: void test_class<int>::something_else() [T = int]:
     debug_assert(0.5 != .5);
     Where:
         .5 => 0.5
@@ -178,7 +178,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1403: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1403: void test_class<int>::something_else() [T = int]:
     debug_assert(0.1 + 0.2 == 0.3);
     Where:
         0.1 + 0.2 => 0.30000000000000004
@@ -193,7 +193,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:1404: void test_class<int>::something_else() [T = int]:
+Assertion failed at integration/integration.cpp:1404: void test_class<int>::something_else() [T = int]:
     ASSERT(.1 + .2 == .3);
     Where:
         .1 + .2 => 0.30000000000000004
@@ -208,7 +208,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1407: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1407: void test_class<int>::something_else() [T = int]:
     debug_assert(ff == .1);
     Where:
         ff => 0.100000001
@@ -223,7 +223,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1408: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1408: void test_class<int>::something_else() [T = int]:
     debug_assert(.1f == .1);
     Where:
         .1f => 0.100000001
@@ -239,7 +239,7 @@ Stack trace:
 
 
 ===================== [value printing: ostream overloads] =====================
-Assertion failed at integration/integration.cpp:1502: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1502: void test_class<int>::something_else() [T = int]:
     debug_assert(p == printable{2.55});
     Where:
         p               => (printable = 1.42)
@@ -255,7 +255,7 @@ Stack trace:
 
 
 ===================== [value printing: no ostream overload] =====================
-Assertion failed at integration/integration.cpp:1602: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1602: void test_class<int>::something_else() [T = int]:
     debug_assert(p == not_printable{2.55});
     Where:
         p                   => <instance of not_printable<double>>
@@ -270,7 +270,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1603: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1603: void test_class<int>::something_else() [T = int]:
     debug_assert(p.f == not_printable{2.55}.f);
     Where:
         p.f                   => <instance of std::optional<double>>
@@ -286,7 +286,7 @@ Stack trace:
 
 
 ===================== [optional messages] =====================
-Assertion failed at integration/integration.cpp:1701: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1701: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -300,7 +300,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1702: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1702: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
@@ -312,7 +312,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1703: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1703: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
@@ -324,7 +324,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1704: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1704: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
@@ -336,7 +336,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1705: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1705: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
@@ -348,7 +348,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1706: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1706: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -362,7 +362,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1707: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1707: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -376,7 +376,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1708: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1708: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -390,7 +390,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1709: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1709: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -404,7 +404,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1710: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1710: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         nullptr => nullptr
@@ -418,7 +418,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1711: void test_class<int>::something_else() [T = int]: (nullptr)
+Debug Assertion failed at integration/integration.cpp:1711: void test_class<int>::something_else() [T = int]: (nullptr)
     debug_assert(false, ...);
 
 Stack trace:
@@ -431,7 +431,7 @@ Stack trace:
 
 
 ===================== [errno] =====================
-Assertion failed at integration/integration.cpp:1802: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1802: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -445,7 +445,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1804: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1804: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -462,7 +462,7 @@ Stack trace:
 ===================== [general] =====================
 foo() called
 bar() called
-Assertion failed at integration/integration.cpp:1901: void test_class<int>::something_else() [T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1901: void test_class<int>::something_else() [T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         false           => false
@@ -480,7 +480,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1902: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:1902: void test_class<int>::something_else() [T = int]:
     debug_assert([] { return false; } ());
 
 Stack trace:
@@ -493,7 +493,7 @@ Stack trace:
 
 
 ===================== [safe comparisons] =====================
-Assertion failed at integration/integration.cpp:2001: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2001: void test_class<int>::something_else() [T = int]:
     debug_assert(18446744073709551606ULL == -10);
 
 Stack trace:
@@ -505,7 +505,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2002: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2002: void test_class<int>::something_else() [T = int]:
     debug_assert(-1 > 1U);
 
 Stack trace:
@@ -518,7 +518,7 @@ Stack trace:
 
 
 ===================== [expression decomposition] =====================
-Assertion failed at integration/integration.cpp:2102: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2102: void test_class<int>::something_else() [T = int]:
     debug_assert(1 == (1 bitand 2));
     Where:
         (1 bitand 2) => 0
@@ -532,7 +532,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2103: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2103: void test_class<int>::something_else() [T = int]:
     debug_assert(1 < 1 < 0);
     Where:
         1 < 1 => false
@@ -546,7 +546,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2104: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2104: void test_class<int>::something_else() [T = int]:
     debug_assert(0 + 0 + 0);
     Where:
         0 + 0 + 0 => 0
@@ -560,7 +560,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2105: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2105: void test_class<int>::something_else() [T = int]:
     debug_assert(false == false == false);
     Where:
         false == false => true
@@ -574,7 +574,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2106: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2106: void test_class<int>::something_else() [T = int]:
     debug_assert(1 << 1 == 200);
     Where:
         1 << 1 => 2
@@ -588,7 +588,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2107: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2107: void test_class<int>::something_else() [T = int]:
     debug_assert(1 << 1 << 31);
     Where:
         1 << 1 => 2
@@ -602,7 +602,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2109: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2109: void test_class<int>::something_else() [T = int]:
     debug_assert(x -= 2);
     Where:
         x => 0
@@ -616,7 +616,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2111: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2111: void test_class<int>::something_else() [T = int]:
     debug_assert(x -= x -= 1);
     Where:
         x      => 0
@@ -631,7 +631,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2113: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2113: void test_class<int>::something_else() [T = int]:
     debug_assert(x -= x -= x -= 1);
     Where:
         x           => 0
@@ -646,7 +646,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2114: void test_class<int>::something_else() [T = int]: pffft
+Debug Assertion failed at integration/integration.cpp:2114: void test_class<int>::something_else() [T = int]: pffft
     debug_assert(true ? false : true, ...);
 
 Stack trace:
@@ -658,7 +658,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2116: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2116: void test_class<int>::something_else() [T = int]:
     debug_assert(a >> 1);
     Where:
         a => 1
@@ -675,7 +675,7 @@ Stack trace:
 ===================== [ensure values are only computed once] =====================
 foo() called
 bar() called
-Assertion failed at integration/integration.cpp:2201: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2201: void test_class<int>::something_else() [T = int]:
     debug_assert(foo() < bar());
     Where:
         foo() => 2
@@ -694,7 +694,7 @@ Stack trace:
 logger_type::logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&) [n=1, other=2]
-Assertion failed at integration/integration.cpp:2304: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2304: void test_class<int>::something_else() [T = int]:
     debug_assert(lt1 == lt2);
     Where:
         lt1 => logger_type [n = 1]
@@ -718,7 +718,7 @@ logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(int, const logger_type&) [b=1, n=2]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:2308: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2308: void test_class<int>::something_else() [T = int]:
     debug_assert(1 == logger_type(2));
     Where:
         logger_type(2) => logger_type [n = 2]
@@ -747,7 +747,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=1, b=2]
 logger_type::logger_type(logger_type&&) [n=1]
-Assertion failed at integration/integration.cpp:2312: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2312: void test_class<int>::something_else() [T = int]:
     debug_assert(logger_type(1) == 2);
     Where:
         logger_type(1) => logger_type [n = 1]
@@ -766,10 +766,6 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::compl logger_type() [n=-2]
-logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=1]
 --------------------------------------------
 
@@ -785,7 +781,7 @@ logger_type::operator==(const logger_type&) [n=1, other=2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:2316: void test_class<int>::something_else() [T = int]:
-    debug_assert(logger_type(1) == logger_type(2));
+    assert(logger_type(1) == logger_type(2));
     Where:
         logger_type(1) => logger_type [n = 1]
         logger_type(2) => logger_type [n = 2]
@@ -816,7 +812,7 @@ logger_type::compl logger_type() [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-Verification failed at integration/integration.cpp:2317: void test_class<int>::something_else() [T = int]:
+Assertion failed at integration/integration.cpp:2317: void test_class<int>::something_else() [T = int]:
     ASSERT(!(std::is_same<decltype(r), logger_type>::value));
 
 Stack trace:
@@ -828,7 +824,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:2318: void test_class<int>::something_else() [T = int]:
+Assertion failed at integration/integration.cpp:2318: void test_class<int>::something_else() [T = int]:
     ASSERT(r.n != 1);
     Where:
         r.n => 1
@@ -849,7 +845,7 @@ logger_type::compl logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 Assertion failed at integration/integration.cpp:601: decltype(auto) test_class<int>::get_lt_a(logger_type &) [T = int]:
-    debug_assert(l == 2);
+    assert(l == 2);
     Where:
         l => logger_type [n = 2]
 
@@ -865,7 +861,7 @@ Stack trace:
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2405: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2405: void test_class<int>::something_else() [T = int]:
     debug_assert(lt == 1);
     Where:
         lt => logger_type [n = 3]
@@ -880,7 +876,7 @@ Stack trace:
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2406: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2406: void test_class<int>::something_else() [T = int]:
     debug_assert(x == 1);
     Where:
         x => logger_type [n = 3]
@@ -897,7 +893,7 @@ Stack trace:
 logger_type::compl logger_type() [n=3]
 --------------------------------------------
 
-Assertion failed at integration/integration.cpp:2411: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2411: void test_class<int>::something_else() [T = int]:
     debug_assert(x ^= 1);
     Where:
         x =>  0  0b00000000000000000000000000000000
@@ -921,7 +917,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:605: decltype(auto) test_class<int>::get_lt_b() [T = int]:
-    debug_assert(logger_type(2) == 2);
+    assert(logger_type(2) == 2);
     Where:
         logger_type(2) => logger_type [n = 2]
 
@@ -947,7 +943,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
-Assertion failed at integration/integration.cpp:2503: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2503: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         x => logger_type [n = 2]
@@ -965,21 +961,21 @@ logger_type::compl logger_type() [n=2]
 --------------------------------------------
 
 ===================== [simple recursion] =====================
-Assertion failed at integration/integration.cpp:501: void rec(int):
+Debug Assertion failed at integration/integration.cpp:501: void rec(int):
     debug_assert(false);
 
 Stack trace:
 # 1 rec(int)
       at integration.cpp:501
 # 2 rec(int)
-      at integration.cpp:?
+      at integration.cpp:502
 |                                   |
 | 8 layers of recursion were folded |
 |                                   |
 #11 rec(int)
-      at integration.cpp:?
+      at integration.cpp:502
 #12 test_class<int>::something_else()
-      at integration.cpp:2602
+      at integration.cpp:2600
 #13 void test_class<int>::something<N>(std::pair<N, int>)
       at integration.cpp:1004
 #14 main
@@ -987,34 +983,34 @@ Stack trace:
 
 
 ===================== [other recursion] =====================
-Assertion failed at integration/integration.cpp:508: void recursive_a(int):
+Debug Assertion failed at integration/integration.cpp:508: void recursive_a(int):
     debug_assert(false);
 
 Stack trace:
 # 1 recursive_a(int)
       at integration.cpp:508
 # 2 recursive_b(int)
-      at integration.cpp:?
+      at integration.cpp:514
 # 3 recursive_a(int)
-      at integration.cpp:?
+      at integration.cpp:509
 # 4 recursive_b(int)
-      at integration.cpp:?
+      at integration.cpp:514
 # 5 recursive_a(int)
-      at integration.cpp:?
+      at integration.cpp:509
 # 6 recursive_b(int)
-      at integration.cpp:?
+      at integration.cpp:514
 # 7 recursive_a(int)
-      at integration.cpp:?
+      at integration.cpp:509
 # 8 recursive_b(int)
-      at integration.cpp:?
+      at integration.cpp:514
 # 9 recursive_a(int)
-      at integration.cpp:?
+      at integration.cpp:509
 #10 recursive_b(int)
-      at integration.cpp:?
+      at integration.cpp:514
 #11 recursive_a(int)
-      at integration.cpp:?
+      at integration.cpp:509
 #12 test_class<int>::something_else()
-      at integration.cpp:2703
+      at integration.cpp:2700
 #13 void test_class<int>::something<N>(std::pair<N, int>)
       at integration.cpp:1004
 #14 main
@@ -1022,14 +1018,14 @@ Stack trace:
 
 
 ===================== [Path differentiation] =====================
-Assertion failed at integration/x/a.cpp:5: void test_path_differentiation_2():
+Debug Assertion failed at /mnt/c/Users/rifkin/home/projects/libassert/tests/integration/x/a.cpp:5: void test_path_differentiation_2():
     debug_assert(false);
 
 Stack trace:
 # 1 test_path_differentiation_2()
       at x/a.cpp:5
 # 2 test_path_differentiation()
-      at integration/a.cpp:8
+      at integration/a.cpp:7
 # 3 test_class<int>::something_else()
       at integration.cpp:2800
 # 4 void test_class<int>::something<N>(std::pair<N, int>)
@@ -1039,7 +1035,7 @@ Stack trace:
 
 
 ===================== [Enum handling] =====================
-Assertion failed at integration/integration.cpp:2904: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2904: void test_class<int>::something_else() [T = int]:
     debug_assert(a != A);
     Where:
         a => 0
@@ -1054,7 +1050,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2906: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:2906: void test_class<int>::something_else() [T = int]:
     debug_assert(b != bar::A);
     Where:
         b      => A
@@ -1070,7 +1066,7 @@ Stack trace:
 
 
 ===================== [Literal format handling] =====================
-Assertion failed at integration/integration.cpp:3001: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3001: void test_class<int>::something_else() [T = int]:
     debug_assert(0xff == 077);
     Where:
         0xff =>  255  0xff  0377
@@ -1085,7 +1081,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3002: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3002: void test_class<int>::something_else() [T = int]:
     debug_assert('x' == 20);
     Where:
         'x' =>  'x'     120
@@ -1100,7 +1096,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3003: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3003: void test_class<int>::something_else() [T = int]:
     debug_assert('x' == 'y');
 
 Stack trace:
@@ -1112,7 +1108,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3005: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3005: void test_class<int>::something_else() [T = int]:
     debug_assert(c == 20);
     Where:
         c  =>  'x'     120
@@ -1128,7 +1124,7 @@ Stack trace:
 
 
 ===================== [Container printing] =====================
-Assertion failed at integration/integration.cpp:3104: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3104: void test_class<int>::something_else() [T = int]:
     debug_assert(a == b, ...);
     Where:
         a => std::set<int> [size: 4]: [2, 4, 6, 10]
@@ -1145,7 +1141,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3109: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3109: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m0 => std::map<std::string, int> [size: 2]: [["bar", -2], ["foo", 2]]
@@ -1159,7 +1155,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3114: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3114: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m1 => std::map<std::string, std::vector<int>> [size: 2]: [["bar", [-100, 200, 400, -800]], ["foo", [1, -2, 3, -4]]]
@@ -1173,7 +1169,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3116: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3116: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         t => std::tuple<int, double, const char *>: [1, 0.30000000000000004, "foobars"]
@@ -1187,7 +1183,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3118: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3118: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         arr => std::array<int, 10> [size: 10]: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -1201,7 +1197,7 @@ Stack trace:
       at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3120: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3120: void test_class<int>::something_else() [T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         carr => int[5] [size: 5]: [5, 4, 3, 2, 1]
@@ -1216,7 +1212,7 @@ Stack trace:
 
 
 ===================== [Type cleaning] =====================
-Assertion failed at integration/integration.cpp:3305: void test_class<int>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>> &) [T = int]:
+Debug Assertion failed at integration/integration.cpp:3305: void test_class<int>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>> &) [T = int]:
     debug_assert(map == other);
     Where:
         map   => std::map<std::string, std::vector<std::string_view>> [size: 2]: [["bar", ["b1", "b3", "b5"]], ["foo", ["f1", "f3", "f5"]]]
@@ -1234,7 +1230,7 @@ Stack trace:
 
 
 ===================== [Debug stringification customization point] =====================
-Assertion failed at integration/integration.cpp:3402: void test_class<int>::something_else() [T = int]:
+Debug Assertion failed at integration/integration.cpp:3402: void test_class<int>::something_else() [T = int]:
     debug_assert(x == y, ...);
     Where:
         x => (debug_print_customization = 2)
@@ -1253,7 +1249,7 @@ Stack trace:
 
 
 ===================== [Complex type resolution] =====================
-Assertion failed at integration/integration.cpp:3602: void test_class<int>::test_complex_typing(const volatile std::vector<std::string> *const &, int *, const char (&)[4], decltype(&complex_typing::S::foo), int complex_typing::S::*) [T = int]:
+Debug Assertion failed at integration/integration.cpp:3602: void test_class<int>::test_complex_typing(const volatile std::vector<std::string> *const &, int *, const char (&)[4], decltype(&complex_typing::S::foo), int complex_typing::S::*) [T = int]:
     debug_assert(false);
 
 Stack trace:
diff --git a/tests/integration/expected/gnu.txt b/tests/integration/expected/gnu.txt
index a5b0f32e..13810d90 100644
--- a/tests/integration/expected/gnu.txt
+++ b/tests/integration/expected/gnu.txt
@@ -1,5 +1,5 @@
 ===================== [value printing: strings] =====================
-Assertion failed at integration/integration.cpp:1103: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1103: void test_class<T>::something_else() [with T = int]:
     debug_assert(s == "test");
     Where:
         s => "test\n"
@@ -8,12 +8,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1103
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1104: void test_class<T>::something_else() [with T = int]:
     debug_assert(s[i] == 'c', ...);
     Where:
         s[i] => 't'
@@ -25,12 +25,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1107: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1107: void test_class<T>::something_else() [with T = int]:
     debug_assert(buffer == thing);
     Where:
         buffer => char*: nullptr
@@ -40,12 +40,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1107
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1108: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1108: void test_class<T>::something_else() [with T = int]:
     debug_assert(buffer == +thing);
     Where:
         buffer => char*: nullptr
@@ -55,12 +55,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1108
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1110: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1110: void test_class<T>::something_else() [with T = int]:
     debug_assert(s == sv);
     Where:
         s  => "test\n"
@@ -70,13 +70,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1110
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: pointers] =====================
-Assertion failed at integration/integration.cpp:1201: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1201: void test_class<T>::something_else() [with T = int]:
     debug_assert((uintptr_t)-1 == 0xff);
     Where:
         (uintptr_t)-1 =>  18446744073709551615  0xffffffffffffffff
@@ -86,12 +86,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1201
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1202: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1202: void test_class<T>::something_else() [with T = int]:
     debug_assert((uintptr_t)-1 == (uintptr_t)0xff);
     Where:
         (uintptr_t)-1   => 18446744073709551615
@@ -101,12 +101,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1202
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1204: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1204: void test_class<T>::something_else() [with T = int]:
     debug_assert(foo == nullptr);
     Where:
         foo => void*: 0xdeadbeef
@@ -115,13 +115,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1204
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: number formats] =====================
-Assertion failed at integration/integration.cpp:1303: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1303: void test_class<T>::something_else() [with T = int]:
     debug_assert(mask bitand flags);
     Where:
         mask  =>  405  0b0000000110010101
@@ -131,12 +131,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1303
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1304: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1304: void test_class<T>::something_else() [with T = int]:
     debug_assert(0xf == 16);
     Where:
         0xf =>  15  0xf
@@ -146,25 +146,25 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1304
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: floating point] =====================
-Assertion failed at integration/integration.cpp:1401: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1401: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == 1.5);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1401
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1402: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1402: void test_class<T>::something_else() [with T = int]:
     debug_assert(0.5 != .5);
     Where:
         .5 => 0.5
@@ -173,12 +173,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1402
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1403: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1403: void test_class<T>::something_else() [with T = int]:
     debug_assert(0.1 + 0.2 == 0.3);
     Where:
         0.1 + 0.2 => 0.30000000000000004
@@ -188,12 +188,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1403
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:1404: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:1404: void test_class<T>::something_else() [with T = int]:
     ASSERT(.1 + .2 == .3);
     Where:
         .1 + .2 => 0.30000000000000004
@@ -203,12 +203,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1404
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1407: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1407: void test_class<T>::something_else() [with T = int]:
     debug_assert(ff == .1);
     Where:
         ff => 0.100000001
@@ -218,12 +218,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1407
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1408: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1408: void test_class<T>::something_else() [with T = int]:
     debug_assert(.1f == .1);
     Where:
         .1f => 0.100000001
@@ -233,13 +233,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1408
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: ostream overloads] =====================
-Assertion failed at integration/integration.cpp:1502: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1502: void test_class<T>::something_else() [with T = int]:
     debug_assert(p == printable{2.55});
     Where:
         p               => (printable = 1.42)
@@ -249,13 +249,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1502
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: no ostream overload] =====================
-Assertion failed at integration/integration.cpp:1602: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1602: void test_class<T>::something_else() [with T = int]:
     debug_assert(p == not_printable{2.55});
     Where:
         p                   => <instance of not_printable<double>>
@@ -265,12 +265,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1602
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1603: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1603: void test_class<T>::something_else() [with T = int]:
     debug_assert(p.f == not_printable{2.55}.f);
     Where:
         p.f                   => <instance of std::optional<double>>
@@ -280,13 +280,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1603
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [optional messages] =====================
-Assertion failed at integration/integration.cpp:1701: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1701: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -295,60 +295,60 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1701
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1702: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1702: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1702
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1703: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1703: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1703
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1704: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1704: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1704
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1705: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1705: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1705
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1706: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1706: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -357,12 +357,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1706
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1707: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1707: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -371,12 +371,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1707
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1708: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1708: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -385,12 +385,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1708
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1709: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1709: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -399,12 +399,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1709
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1710: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1710: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         nullptr => nullptr
@@ -413,25 +413,25 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1710
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1711: void test_class<T>::something_else() [with T = int]: (nullptr)
+Debug Assertion failed at integration/integration.cpp:1711: void test_class<T>::something_else() [with T = int]: (nullptr)
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1711
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [errno] =====================
-Assertion failed at integration/integration.cpp:1802: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1802: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -440,12 +440,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1802
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1804: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1804: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -454,15 +454,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1804
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [general] =====================
 bar() called
 foo() called
-Assertion failed at integration/integration.cpp:1901: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1901: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         false           => false
@@ -475,50 +475,50 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1901
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1902: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1902: void test_class<T>::something_else() [with T = int]:
     debug_assert([] { return false; } ());
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1902
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [safe comparisons] =====================
-Assertion failed at integration/integration.cpp:2001: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2001: void test_class<T>::something_else() [with T = int]:
     debug_assert(18446744073709551606ULL == -10);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2001
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2002: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2002: void test_class<T>::something_else() [with T = int]:
     debug_assert(-1 > 1U);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2002
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [expression decomposition] =====================
-Assertion failed at integration/integration.cpp:2102: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2102: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == (1 bitand 2));
     Where:
         (1 bitand 2) => 0
@@ -527,12 +527,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2102
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2103: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2103: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 < 1 < 0);
     Where:
         1 < 1 => false
@@ -541,12 +541,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2103
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2104: void test_class<T>::something_else() [with T = int]:
     debug_assert(0 + 0 + 0);
     Where:
         0 + 0 + 0 => 0
@@ -555,12 +555,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2105: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2105: void test_class<T>::something_else() [with T = int]:
     debug_assert(false == false == false);
     Where:
         false == false => true
@@ -569,12 +569,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2105
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2106: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2106: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 << 1 == 200);
     Where:
         1 << 1 => 2
@@ -583,12 +583,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2106
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2107: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2107: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 << 1 << 31);
     Where:
         1 << 1 => 2
@@ -597,12 +597,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2107
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2109: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2109: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= 2);
     Where:
         x => 0
@@ -611,12 +611,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2109
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2111: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2111: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= x -= 1);
     Where:
         x      => 0
@@ -626,12 +626,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2111
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2113: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2113: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= x -= x -= 1);
     Where:
         x           => 0
@@ -641,24 +641,24 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2113
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2114: void test_class<T>::something_else() [with T = int]: pffft
+Debug Assertion failed at integration/integration.cpp:2114: void test_class<T>::something_else() [with T = int]: pffft
     debug_assert(true ? false : true, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2114
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
     debug_assert(a >> 1);
     Where:
         a => 1
@@ -667,15 +667,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2116
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [ensure values are only computed once] =====================
 bar() called
 foo() called
-Assertion failed at integration/integration.cpp:2201: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2201: void test_class<T>::something_else() [with T = int]:
     debug_assert(foo() < bar());
     Where:
         foo() => 2
@@ -685,16 +685,16 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2201
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value forwarding: copy / moves] =====================
 logger_type::logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&) [n=1, other=2]
-Assertion failed at integration/integration.cpp:2304: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2304: void test_class<T>::something_else() [with T = int]:
     debug_assert(lt1 == lt2);
     Where:
         lt1 => logger_type [n = 1]
@@ -704,9 +704,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2304
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
@@ -718,7 +718,7 @@ logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(int, const logger_type&) [b=1, n=2]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:2308: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2308: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == logger_type(2));
     Where:
         logger_type(2) => logger_type [n = 2]
@@ -727,9 +727,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2308
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -747,7 +747,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=1, b=2]
 logger_type::logger_type(logger_type&&) [n=1]
-Assertion failed at integration/integration.cpp:2312: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2312: void test_class<T>::something_else() [with T = int]:
     debug_assert(logger_type(1) == 2);
     Where:
         logger_type(1) => logger_type [n = 1]
@@ -756,9 +756,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2312
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -766,10 +766,6 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::compl logger_type() [n=-2]
-logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=1]
 --------------------------------------------
 
@@ -785,7 +781,7 @@ logger_type::operator==(const logger_type&) [n=1, other=2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:2316: void test_class<T>::something_else() [with T = int]:
-    debug_assert(logger_type(1) == logger_type(2));
+    assert(logger_type(1) == logger_type(2));
     Where:
         logger_type(1) => logger_type [n = 1]
         logger_type(2) => logger_type [n = 2]
@@ -794,9 +790,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2316
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -816,19 +812,19 @@ logger_type::compl logger_type() [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-Verification failed at integration/integration.cpp:2317: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:2317: void test_class<T>::something_else() [with T = int]:
     ASSERT(!(std::is_same<decltype(r), logger_type>::value));
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2317
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:2318: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:2318: void test_class<T>::something_else() [with T = int]:
     ASSERT(r.n != 1);
     Where:
         r.n => 1
@@ -837,9 +833,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2318
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=1]
@@ -849,7 +845,7 @@ logger_type::compl logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 Assertion failed at integration/integration.cpp:601: decltype(auto) test_class<T>::get_lt_a(logger_type&) [with T = int]:
-    debug_assert(l == 2);
+    assert(l == 2);
     Where:
         l => logger_type [n = 2]
 
@@ -859,13 +855,13 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:2403
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2405: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2405: void test_class<T>::something_else() [with T = int]:
     debug_assert(lt == 1);
     Where:
         lt => logger_type [n = 3]
@@ -874,13 +870,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2405
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2406: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2406: void test_class<T>::something_else() [with T = int]:
     debug_assert(x == 1);
     Where:
         x => logger_type [n = 3]
@@ -889,15 +885,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2406
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=3]
 --------------------------------------------
 
-Assertion failed at integration/integration.cpp:2411: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2411: void test_class<T>::something_else() [with T = int]:
     debug_assert(x ^= 1);
     Where:
         x =>  0  0b00000000000000000000000000000000
@@ -907,9 +903,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2411
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value forwarding: rvalues] =====================
@@ -921,7 +917,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:605: decltype(auto) test_class<T>::get_lt_b() [with T = int]:
-    debug_assert(logger_type(2) == 2);
+    assert(logger_type(2) == 2);
     Where:
         logger_type(2) => logger_type [n = 2]
 
@@ -929,11 +925,11 @@ Stack trace:
 # 1 test_class<int>::get_lt_b()
       at integration.cpp:605
 # 2 test_class<int>::something_else()
-      at integration.cpp:2503
+      at integration.cpp:2502
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -947,7 +943,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
-Assertion failed at integration/integration.cpp:2503: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2503: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         x => logger_type [n = 2]
@@ -956,90 +952,90 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2503
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
 --------------------------------------------
 
 ===================== [simple recursion] =====================
-Assertion failed at integration/integration.cpp:501: void rec(int):
+Debug Assertion failed at integration/integration.cpp:501: void rec(int):
     debug_assert(false);
 
 Stack trace:
 # 1 rec(int)
       at integration.cpp:501
 # 2 rec(int)
-      at integration.cpp:503
+      at integration.cpp:502
 |                                   |
 | 8 layers of recursion were folded |
 |                                   |
 #11 rec(int)
-      at integration.cpp:503
+      at integration.cpp:502
 #12 test_class<int>::something_else()
-      at integration.cpp:2602
+      at integration.cpp:2600
 #13 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 #14 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [other recursion] =====================
-Assertion failed at integration/integration.cpp:508: void recursive_a(int):
+Debug Assertion failed at integration/integration.cpp:508: void recursive_a(int):
     debug_assert(false);
 
 Stack trace:
 # 1 recursive_a(int)
       at integration.cpp:508
 # 2 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 3 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 4 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 5 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 6 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 7 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 8 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 9 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 #10 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 #11 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 #12 test_class<int>::something_else()
-      at integration.cpp:2703
+      at integration.cpp:2700
 #13 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 #14 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Path differentiation] =====================
-Assertion failed at integration/x/a.cpp:5: void test_path_differentiation_2():
+Debug Assertion failed at /mnt/c/Users/rifkin/home/projects/libassert/tests/integration/x/a.cpp:5: void test_path_differentiation_2():
     debug_assert(false);
 
 Stack trace:
 # 1 test_path_differentiation_2()
       at x/a.cpp:5
 # 2 test_path_differentiation()
-      at integration/a.cpp:8
+      at integration/a.cpp:7
 # 3 test_class<int>::something_else()
-      at integration.cpp:2801
+      at integration.cpp:2800
 # 4 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 5 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Enum handling] =====================
-Assertion failed at integration/integration.cpp:2904: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2904: void test_class<T>::something_else() [with T = int]:
     debug_assert(a != A);
     Where:
         a => 0
@@ -1049,12 +1045,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2904
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2906: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2906: void test_class<T>::something_else() [with T = int]:
     debug_assert(b != bar::A);
     Where:
         b      => A
@@ -1064,13 +1060,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2906
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Literal format handling] =====================
-Assertion failed at integration/integration.cpp:3001: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3001: void test_class<T>::something_else() [with T = int]:
     debug_assert(0xff == 077);
     Where:
         0xff =>  255  0xff  0377
@@ -1080,12 +1076,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3001
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3002: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3002: void test_class<T>::something_else() [with T = int]:
     debug_assert('x' == 20);
     Where:
         'x' =>  'x'     120
@@ -1095,24 +1091,24 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3002
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3003: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3003: void test_class<T>::something_else() [with T = int]:
     debug_assert('x' == 'y');
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3003
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3005: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3005: void test_class<T>::something_else() [with T = int]:
     debug_assert(c == 20);
     Where:
         c  =>  'x'     120
@@ -1122,13 +1118,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3005
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Container printing] =====================
-Assertion failed at integration/integration.cpp:3104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3104: void test_class<T>::something_else() [with T = int]:
     debug_assert(a == b, ...);
     Where:
         a => std::set<int> [size: 4]: [2, 4, 6, 10]
@@ -1140,12 +1136,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3109: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3109: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m0 => std::map<std::string, int> [size: 2]: [["bar", -2], ["foo", 2]]
@@ -1154,12 +1150,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3109
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3114: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3114: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m1 => std::map<std::string, std::vector<int>> [size: 2]: [["bar", [-100, 200, 400, -800]], ["foo", [1, -2, 3, -4]]]
@@ -1168,12 +1164,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3114
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3116: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3116: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         t => std::tuple<int, double, const char*>: [1, 0.30000000000000004, "foobars"]
@@ -1182,12 +1178,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3116
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3118: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3118: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         arr => std::array<int, 10> [size: 10]: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -1196,12 +1192,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3118
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3120: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3120: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         carr => int [5] [size: 5]: [5, 4, 3, 2, 1]
@@ -1210,13 +1206,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3120
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Type cleaning] =====================
-Assertion failed at integration/integration.cpp:3305: void test_class<T>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>>&) [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3305: void test_class<T>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>>&) [with T = int]:
     debug_assert(map == other);
     Where:
         map   => std::map<std::string, std::vector<std::string_view>> [size: 2]: [["bar", ["b1", "b3", "b5"]], ["foo", ["f1", "f3", "f5"]]]
@@ -1228,13 +1224,13 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:3201
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Debug stringification customization point] =====================
-Assertion failed at integration/integration.cpp:3402: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3402: void test_class<T>::something_else() [with T = int]:
     debug_assert(x == y, ...);
     Where:
         x => (debug_print_customization = 2)
@@ -1247,13 +1243,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3402
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Complex type resolution] =====================
-Assertion failed at integration/integration.cpp:3602: void test_class<T>::test_complex_typing(const volatile std::vector<std::string>* const&, int*, const char (&)[4], void (complex_typing::S::*)(int, std::string, void***, void* (*)(int), void (* (*)(int))(), void (* (* (*)(int))[5])()), int complex_typing::S::*) [with T = int; std::string = std::string]:
+Debug Assertion failed at integration/integration.cpp:3602: void test_class<T>::test_complex_typing(const volatile std::vector<std::string>* const&, int*, const char (&)[4], void (complex_typing::S::*)(int, std::string, void***, void* (*)(int), void (* (*)(int))(), void (* (* (*)(int))[5])()), int complex_typing::S::*) [with T = int; std::string = std::string]:
     debug_assert(false);
 
 Stack trace:
@@ -1262,8 +1258,8 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:3502
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
diff --git a/tests/integration/expected/gnu.windows.txt b/tests/integration/expected/gnu.windows.txt
index 2b8e26b7..bd71fed1 100644
--- a/tests/integration/expected/gnu.windows.txt
+++ b/tests/integration/expected/gnu.windows.txt
@@ -1,5 +1,5 @@
 ===================== [value printing: strings] =====================
-Assertion failed at integration/integration.cpp:1103: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1103: void test_class<T>::something_else() [with T = int]:
     debug_assert(s == "test");
     Where:
         s => "test\n"
@@ -8,12 +8,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1103
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1104: void test_class<T>::something_else() [with T = int]:
     debug_assert(s[i] == 'c', ...);
     Where:
         s[i] => 't'
@@ -25,12 +25,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1107: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1107: void test_class<T>::something_else() [with T = int]:
     debug_assert(buffer == thing);
     Where:
         buffer => char*: nullptr
@@ -40,12 +40,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1107
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1108: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1108: void test_class<T>::something_else() [with T = int]:
     debug_assert(buffer == +thing);
     Where:
         buffer => char*: nullptr
@@ -55,12 +55,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1108
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1110: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1110: void test_class<T>::something_else() [with T = int]:
     debug_assert(s == sv);
     Where:
         s  => "test\n"
@@ -70,13 +70,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1110
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: pointers] =====================
-Assertion failed at integration/integration.cpp:1201: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1201: void test_class<T>::something_else() [with T = int]:
     debug_assert((uintptr_t)-1 == 0xff);
     Where:
         (uintptr_t)-1 =>  18446744073709551615  0xffffffffffffffff
@@ -86,12 +86,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1201
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1202: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1202: void test_class<T>::something_else() [with T = int]:
     debug_assert((uintptr_t)-1 == (uintptr_t)0xff);
     Where:
         (uintptr_t)-1   => 18446744073709551615
@@ -101,12 +101,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1202
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1204: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1204: void test_class<T>::something_else() [with T = int]:
     debug_assert(foo == nullptr);
     Where:
         foo => void*: 0xdeadbeef
@@ -115,13 +115,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1204
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: number formats] =====================
-Assertion failed at integration/integration.cpp:1303: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1303: void test_class<T>::something_else() [with T = int]:
     debug_assert(mask bitand flags);
     Where:
         mask  =>  405  0b0000000110010101
@@ -131,12 +131,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1303
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1304: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1304: void test_class<T>::something_else() [with T = int]:
     debug_assert(0xf == 16);
     Where:
         0xf =>  15  0xf
@@ -146,25 +146,25 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1304
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: floating point] =====================
-Assertion failed at integration/integration.cpp:1401: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1401: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == 1.5);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1401
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1402: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1402: void test_class<T>::something_else() [with T = int]:
     debug_assert(0.5 != .5);
     Where:
         .5 => 0.5
@@ -173,12 +173,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1402
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1403: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1403: void test_class<T>::something_else() [with T = int]:
     debug_assert(0.1 + 0.2 == 0.3);
     Where:
         0.1 + 0.2 => 0.30000000000000004
@@ -188,12 +188,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1403
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:1404: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:1404: void test_class<T>::something_else() [with T = int]:
     ASSERT(.1 + .2 == .3);
     Where:
         .1 + .2 => 0.30000000000000004
@@ -203,12 +203,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1404
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1407: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1407: void test_class<T>::something_else() [with T = int]:
     debug_assert(ff == .1);
     Where:
         ff => 0.100000001
@@ -218,12 +218,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1407
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1408: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1408: void test_class<T>::something_else() [with T = int]:
     debug_assert(.1f == .1);
     Where:
         .1f => 0.100000001
@@ -233,13 +233,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1408
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: ostream overloads] =====================
-Assertion failed at integration/integration.cpp:1502: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1502: void test_class<T>::something_else() [with T = int]:
     debug_assert(p == printable{2.55});
     Where:
         p               => (printable = 1.42)
@@ -249,13 +249,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1502
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value printing: no ostream overload] =====================
-Assertion failed at integration/integration.cpp:1602: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1602: void test_class<T>::something_else() [with T = int]:
     debug_assert(p == not_printable{2.55});
     Where:
         p                   => <instance of not_printable<double>>
@@ -265,12 +265,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1602
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1603: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1603: void test_class<T>::something_else() [with T = int]:
     debug_assert(p.f == not_printable{2.55}.f);
     Where:
         p.f                   => <instance of std::optional<double>>
@@ -280,13 +280,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1603
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [optional messages] =====================
-Assertion failed at integration/integration.cpp:1701: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1701: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -295,60 +295,60 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1701
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1702: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1702: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1702
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1703: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1703: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1703
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1704: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1704: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1704
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1705: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1705: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1705
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1706: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1706: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -357,12 +357,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1706
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1707: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1707: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -371,12 +371,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1707
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1708: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1708: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -385,12 +385,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1708
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1709: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1709: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
@@ -399,12 +399,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1709
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1710: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1710: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         nullptr => nullptr
@@ -413,25 +413,25 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1710
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1711: void test_class<T>::something_else() [with T = int]: (nullptr)
+Debug Assertion failed at integration/integration.cpp:1711: void test_class<T>::something_else() [with T = int]: (nullptr)
     debug_assert(false, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1711
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [errno] =====================
-Assertion failed at integration/integration.cpp:1802: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1802: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -440,12 +440,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1802
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1804: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1804: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
@@ -454,15 +454,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1804
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [general] =====================
 bar() called
 foo() called
-Assertion failed at integration/integration.cpp:1901: void test_class<T>::something_else() [with T = int]: foo
+Debug Assertion failed at integration/integration.cpp:1901: void test_class<T>::something_else() [with T = int]: foo
     debug_assert(false, ...);
     Extra diagnostics:
         false           => false
@@ -475,50 +475,50 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1901
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1902: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:1902: void test_class<T>::something_else() [with T = int]:
     debug_assert([] { return false; } ());
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:1902
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [safe comparisons] =====================
-Assertion failed at integration/integration.cpp:2001: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2001: void test_class<T>::something_else() [with T = int]:
     debug_assert(18446744073709551606ULL == -10);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2001
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2002: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2002: void test_class<T>::something_else() [with T = int]:
     debug_assert(-1 > 1U);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2002
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [expression decomposition] =====================
-Assertion failed at integration/integration.cpp:2102: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2102: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == (1 bitand 2));
     Where:
         (1 bitand 2) => 0
@@ -527,12 +527,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2102
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2103: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2103: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 < 1 < 0);
     Where:
         1 < 1 => false
@@ -541,12 +541,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2103
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2104: void test_class<T>::something_else() [with T = int]:
     debug_assert(0 + 0 + 0);
     Where:
         0 + 0 + 0 => 0
@@ -555,12 +555,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2105: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2105: void test_class<T>::something_else() [with T = int]:
     debug_assert(false == false == false);
     Where:
         false == false => true
@@ -569,12 +569,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2105
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2106: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2106: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 << 1 == 200);
     Where:
         1 << 1 => 2
@@ -583,12 +583,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2106
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2107: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2107: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 << 1 << 31);
     Where:
         1 << 1 => 2
@@ -597,12 +597,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2107
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2109: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2109: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= 2);
     Where:
         x => 0
@@ -611,12 +611,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2109
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2111: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2111: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= x -= 1);
     Where:
         x      => 0
@@ -626,12 +626,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2111
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2113: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2113: void test_class<T>::something_else() [with T = int]:
     debug_assert(x -= x -= x -= 1);
     Where:
         x           => 0
@@ -641,24 +641,24 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2113
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2114: void test_class<T>::something_else() [with T = int]: pffft
+Debug Assertion failed at integration/integration.cpp:2114: void test_class<T>::something_else() [with T = int]: pffft
     debug_assert(true ? false : true, ...);
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2114
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2116: void test_class<T>::something_else() [with T = int]:
     debug_assert(a >> 1);
     Where:
         a => 1
@@ -667,15 +667,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2116
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [ensure values are only computed once] =====================
 bar() called
 foo() called
-Assertion failed at integration/integration.cpp:2201: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2201: void test_class<T>::something_else() [with T = int]:
     debug_assert(foo() < bar());
     Where:
         foo() => 2
@@ -685,16 +685,16 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2201
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value forwarding: copy / moves] =====================
 logger_type::logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&) [n=1, other=2]
-Assertion failed at integration/integration.cpp:2304: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2304: void test_class<T>::something_else() [with T = int]:
     debug_assert(lt1 == lt2);
     Where:
         lt1 => logger_type [n = 1]
@@ -704,9 +704,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2304
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
@@ -718,7 +718,7 @@ logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(int, const logger_type&) [b=1, n=2]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:2308: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2308: void test_class<T>::something_else() [with T = int]:
     debug_assert(1 == logger_type(2));
     Where:
         logger_type(2) => logger_type [n = 2]
@@ -727,9 +727,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2308
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -747,7 +747,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=1, b=2]
 logger_type::logger_type(logger_type&&) [n=1]
-Assertion failed at integration/integration.cpp:2312: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2312: void test_class<T>::something_else() [with T = int]:
     debug_assert(logger_type(1) == 2);
     Where:
         logger_type(1) => logger_type [n = 1]
@@ -756,9 +756,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2312
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -766,10 +766,6 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::compl logger_type() [n=-2]
-logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=1]
 --------------------------------------------
 
@@ -785,7 +781,7 @@ logger_type::operator==(const logger_type&) [n=1, other=2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:2316: void test_class<T>::something_else() [with T = int]:
-    debug_assert(logger_type(1) == logger_type(2));
+    assert(logger_type(1) == logger_type(2));
     Where:
         logger_type(1) => logger_type [n = 1]
         logger_type(2) => logger_type [n = 2]
@@ -794,9 +790,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2316
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -816,19 +812,19 @@ logger_type::compl logger_type() [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-Verification failed at integration/integration.cpp:2317: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:2317: void test_class<T>::something_else() [with T = int]:
     ASSERT(!(std::is_same<decltype(r), logger_type>::value));
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2317
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:2318: void test_class<T>::something_else() [with T = int]:
+Assertion failed at integration/integration.cpp:2318: void test_class<T>::something_else() [with T = int]:
     ASSERT(r.n != 1);
     Where:
         r.n => 1
@@ -837,9 +833,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2318
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=1]
@@ -849,7 +845,7 @@ logger_type::compl logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 Assertion failed at integration/integration.cpp:601: decltype(auto) test_class<T>::get_lt_a(logger_type&) [with T = int]:
-    debug_assert(l == 2);
+    assert(l == 2);
     Where:
         l => logger_type [n = 2]
 
@@ -859,13 +855,13 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:2403
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2405: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2405: void test_class<T>::something_else() [with T = int]:
     debug_assert(lt == 1);
     Where:
         lt => logger_type [n = 3]
@@ -874,13 +870,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2405
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2406: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2406: void test_class<T>::something_else() [with T = int]:
     debug_assert(x == 1);
     Where:
         x => logger_type [n = 3]
@@ -889,15 +885,15 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2406
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=3]
 --------------------------------------------
 
-Assertion failed at integration/integration.cpp:2411: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2411: void test_class<T>::something_else() [with T = int]:
     debug_assert(x ^= 1);
     Where:
         x =>  0  0b00000000000000000000000000000000
@@ -907,9 +903,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2411
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [value forwarding: rvalues] =====================
@@ -921,7 +917,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 logger_type::logger_type(logger_type&&) [n=2]
 Assertion failed at integration/integration.cpp:605: decltype(auto) test_class<T>::get_lt_b() [with T = int]:
-    debug_assert(logger_type(2) == 2);
+    assert(logger_type(2) == 2);
     Where:
         logger_type(2) => logger_type [n = 2]
 
@@ -929,11 +925,11 @@ Stack trace:
 # 1 test_class<int>::get_lt_b()
       at integration.cpp:605
 # 2 test_class<int>::something_else()
-      at integration.cpp:2503
+      at integration.cpp:2502
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -947,7 +943,7 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
-Assertion failed at integration/integration.cpp:2503: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2503: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         x => logger_type [n = 2]
@@ -956,90 +952,90 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2503
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
 --------------------------------------------
 
 ===================== [simple recursion] =====================
-Assertion failed at integration/integration.cpp:501: void rec(int):
+Debug Assertion failed at integration/integration.cpp:501: void rec(int):
     debug_assert(false);
 
 Stack trace:
 # 1 rec(int)
       at integration.cpp:501
 # 2 rec(int)
-      at integration.cpp:503
+      at integration.cpp:502
 |                                   |
 | 8 layers of recursion were folded |
 |                                   |
 #11 rec(int)
-      at integration.cpp:503
+      at integration.cpp:502
 #12 test_class<int>::something_else()
-      at integration.cpp:2602
+      at integration.cpp:2600
 #13 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 #14 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [other recursion] =====================
-Assertion failed at integration/integration.cpp:508: void recursive_a(int):
+Debug Assertion failed at integration/integration.cpp:508: void recursive_a(int):
     debug_assert(false);
 
 Stack trace:
 # 1 recursive_a(int)
       at integration.cpp:508
 # 2 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 3 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 4 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 5 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 6 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 7 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 # 8 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 # 9 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 #10 recursive_b(int)
-      at integration.cpp:515
+      at integration.cpp:514
 #11 recursive_a(int)
-      at integration.cpp:510
+      at integration.cpp:509
 #12 test_class<int>::something_else()
-      at integration.cpp:2703
+      at integration.cpp:2700
 #13 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 #14 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Path differentiation] =====================
-Assertion failed at integration/x/a.cpp:5: void test_path_differentiation_2():
+Debug Assertion failed at integration/x/a.cpp:5: void test_path_differentiation_2():
     debug_assert(false);
 
 Stack trace:
 # 1 test_path_differentiation_2()
       at x/a.cpp:5
 # 2 test_path_differentiation()
-      at integration/a.cpp:8
+      at integration/a.cpp:7
 # 3 test_class<int>::something_else()
-      at integration.cpp:2801
+      at integration.cpp:2800
 # 4 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 5 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Enum handling] =====================
-Assertion failed at integration/integration.cpp:2904: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2904: void test_class<T>::something_else() [with T = int]:
     debug_assert(a != A);
     Where:
         a => 0
@@ -1049,12 +1045,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2904
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2906: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:2906: void test_class<T>::something_else() [with T = int]:
     debug_assert(b != bar::A);
     Where:
         b      => A
@@ -1064,13 +1060,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2906
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Literal format handling] =====================
-Assertion failed at integration/integration.cpp:3001: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3001: void test_class<T>::something_else() [with T = int]:
     debug_assert(0xff == 077);
     Where:
         0xff =>  255  0xff  0377
@@ -1080,12 +1076,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3001
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3002: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3002: void test_class<T>::something_else() [with T = int]:
     debug_assert('x' == 20);
     Where:
         'x' =>  'x'     120
@@ -1095,24 +1091,24 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3002
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3003: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3003: void test_class<T>::something_else() [with T = int]:
     debug_assert('x' == 'y');
 
 Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3003
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3005: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3005: void test_class<T>::something_else() [with T = int]:
     debug_assert(c == 20);
     Where:
         c  =>  'x'     120
@@ -1122,13 +1118,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3005
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Container printing] =====================
-Assertion failed at integration/integration.cpp:3104: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3104: void test_class<T>::something_else() [with T = int]:
     debug_assert(a == b, ...);
     Where:
         a => std::set<int> [size: 4]: [2, 4, 6, 10]
@@ -1140,12 +1136,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3104
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3109: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3109: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m0 => std::map<std::string, int> [size: 2]: [["bar", -2], ["foo", 2]]
@@ -1154,12 +1150,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3109
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3114: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3114: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         m1 => std::map<std::string, std::vector<int>> [size: 2]: [["bar", [-100, 200, 400, -800]], ["foo", [1, -2, 3, -4]]]
@@ -1168,12 +1164,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3114
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3116: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3116: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         t => std::tuple<int, double, const char*>: [1, 0.30000000000000004, "foobars"]
@@ -1182,12 +1178,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3116
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3118: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3118: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         arr => std::array<int, 10> [size: 10]: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
@@ -1196,12 +1192,12 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3118
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3120: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3120: void test_class<T>::something_else() [with T = int]:
     debug_assert(false, ...);
     Extra diagnostics:
         carr => int [5] [size: 5]: [5, 4, 3, 2, 1]
@@ -1210,13 +1206,13 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3120
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Type cleaning] =====================
-Assertion failed at integration/integration.cpp:3305: void test_class<T>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>>&) [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3305: void test_class<T>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>>&) [with T = int]:
     debug_assert(map == other);
     Where:
         map   => std::map<std::string, std::vector<std::string_view>> [size: 2]: [["bar", ["b1", "b3", "b5"]], ["foo", ["f1", "f3", "f5"]]]
@@ -1228,13 +1224,13 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:3201
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Debug stringification customization point] =====================
-Assertion failed at integration/integration.cpp:3402: void test_class<T>::something_else() [with T = int]:
+Debug Assertion failed at integration/integration.cpp:3402: void test_class<T>::something_else() [with T = int]:
     debug_assert(x == y, ...);
     Where:
         x => (debug_print_customization = 2)
@@ -1247,23 +1243,23 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:3402
 # 2 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 ===================== [Complex type resolution] =====================
-Assertion failed at integration/integration.cpp:3602: void test_class<T>::test_complex_typing(const volatile std::vector<std::string>* const&, int*, const char (&)[4], void (complex_typing::S::*)(int, std::string, void***, void* (*)(int), void (* (*)(int))(), void (* (* (*)(int))[5])()), int complex_typing::S::*) [with T = int; std::string = std::string]:
+Debug Assertion failed at integration/integration.cpp:3602: void test_class<T>::test_complex_typing(const volatile std::vector<std::string>* const&, int*, const char (&)[4], void (complex_typing::S::*)(int, std::string, void***, void* (*)(int), void (* (*)(int))(), void (* (* (*)(int))[5])()), int complex_typing::S::*) [with T = int; std::string = std::string]:
     debug_assert(false);
 
 Stack trace:
 # 1 test_class<int>::test_complex_typing(std::vector<std::string> const volatile* const&, int*, char const (&) [4], void (complex_typing::S::*)(int, std::string, void***, void* (*)(int), void (*(*)(int))(), void (* (*(*)(int)) [5])()), int complex_typing::S::*)
       at integration.cpp:3602
 # 2 test_class<int>::something_else()
-      at integration.cpp:3504
+      at integration.cpp:3502
 # 3 void test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main
-      at integration.cpp:403
+      at integration.cpp:402
 
 
diff --git a/tests/integration/expected/msvc.txt b/tests/integration/expected/msvc.txt
index b93abfd1..b7656812 100644
--- a/tests/integration/expected/msvc.txt
+++ b/tests/integration/expected/msvc.txt
@@ -1,19 +1,17 @@
 ===================== [value printing: strings] =====================
-Assertion failed at integration/integration.cpp:1103: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1103: void __cdecl test_class<int>::something_else(void):
     debug_assert(s == "test");
     Where:
         s => "test\n"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1104
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1104: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1104: void __cdecl test_class<int>::something_else(void):
     debug_assert(s[i] == 'c', ...);
     Where:
         s[i] => 't'
@@ -22,447 +20,385 @@ Assertion failed at integration/integration.cpp:1104: void __cdecl test_class<in
         i => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1105
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1107: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1107: void __cdecl test_class<int>::something_else(void):
     debug_assert(buffer == thing);
     Where:
         buffer => char*: nullptr
         thing  => "foo"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1108
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1108: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1108: void __cdecl test_class<int>::something_else(void):
     debug_assert(buffer == +thing);
     Where:
         buffer => char*: nullptr
         +thing => "foo"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1109
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1110: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1110: void __cdecl test_class<int>::something_else(void):
     debug_assert(s == sv);
     Where:
         s  => "test\n"
         sv => "foo"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1110
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value printing: pointers] =====================
-Assertion failed at integration/integration.cpp:1201: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1201: void __cdecl test_class<int>::something_else(void):
     debug_assert((uintptr_t)-1 == 0xff);
     Where:
         (uintptr_t)-1 =>  18446744073709551615  0xffffffffffffffff
         0xff          =>  255                   0xff
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1202
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1202: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1202: void __cdecl test_class<int>::something_else(void):
     debug_assert((uintptr_t)-1 == (uintptr_t)0xff);
     Where:
         (uintptr_t)-1   => 18446744073709551615
         (uintptr_t)0xff => 255
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1203
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1204: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1204: void __cdecl test_class<int>::something_else(void):
     debug_assert(foo == nullptr);
     Where:
         foo => void*: 0xdeadbeef
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1207
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value printing: number formats] =====================
-Assertion failed at integration/integration.cpp:1303: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1303: void __cdecl test_class<int>::something_else(void):
     debug_assert(mask & flags);
     Where:
         mask  =>  405  0b0000000110010101
         flags =>  42   0b0000000000101010
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1304
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1304: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1304: void __cdecl test_class<int>::something_else(void):
     debug_assert(0xf == 16);
     Where:
         0xf =>  15  0xf
         16  =>  16  0x10
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1307
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value printing: floating point] =====================
-Assertion failed at integration/integration.cpp:1401: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1401: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 == 1.5);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1402
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1402: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1402: void __cdecl test_class<int>::something_else(void):
     debug_assert(0.5 != .5);
     Where:
         .5 => 0.5
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1403
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1403: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1403: void __cdecl test_class<int>::something_else(void):
     debug_assert(0.1 + 0.2 == 0.3);
     Where:
         0.1 + 0.2 => 0.30000000000000004
         0.3       => 0.29999999999999999
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1404
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:1404: void __cdecl test_class<int>::something_else(void):
+Assertion failed at integration\integration.cpp:1404: void __cdecl test_class<int>::something_else(void):
     ASSERT(.1 + .2 == .3);
     Where:
         .1 + .2 => 0.30000000000000004
         .3      => 0.29999999999999999
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1405
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1407: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1407: void __cdecl test_class<int>::something_else(void):
     debug_assert(ff == .1);
     Where:
         ff => 0.100000001
         .1 => 0.10000000000000001
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1408
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1408: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1408: void __cdecl test_class<int>::something_else(void):
     debug_assert(.1f == .1);
     Where:
         .1f => 0.100000001
         .1  => 0.10000000000000001
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1411
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value printing: ostream overloads] =====================
-Assertion failed at integration/integration.cpp:1502: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1502: void __cdecl test_class<int>::something_else(void):
     debug_assert(p == printable{2.55});
     Where:
         p               => (printable = 1.42)
         printable{2.55} => (printable = 2.55)
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1505
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value printing: no ostream overload] =====================
-Assertion failed at integration/integration.cpp:1602: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1602: void __cdecl test_class<int>::something_else(void):
     debug_assert(p == not_printable{2.55});
     Where:
         p                   => <instance of not_printable<double>>
         not_printable{2.55} => <instance of not_printable<double>>
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1603
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1603: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1603: void __cdecl test_class<int>::something_else(void):
     debug_assert(p.f == not_printable{2.55}.f);
     Where:
         p.f                   => <instance of std::optional<double>>
         not_printable{2.55}.f => <instance of std::optional<double>>
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1607
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [optional messages] =====================
-Assertion failed at integration/integration.cpp:1701: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1701: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1702
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1702: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1702: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1703
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1703: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1703: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1703
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1704: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1704: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1705
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1705: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1705: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1706
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1706: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1706: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1707
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1707: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1707: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1707
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1708: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1708: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1709
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1709: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1709: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         2 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1710
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1710: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1710: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         nullptr => nullptr
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1711
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1711: void __cdecl test_class<int>::something_else(void): (nullptr)
+Debug Assertion failed at integration\integration.cpp:1711: void __cdecl test_class<int>::something_else(void): (nullptr)
     debug_assert(false, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1714
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [errno] =====================
-Assertion failed at integration/integration.cpp:1802: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1802: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1803
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1804: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1804: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         errno =>  2 "No such file or directory"
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1807
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [general] =====================
 bar() called
 foo() called
-Assertion failed at integration/integration.cpp:1901: void __cdecl test_class<int>::something_else(void): foo
+Debug Assertion failed at integration\integration.cpp:1901: void __cdecl test_class<int>::something_else(void): foo
     debug_assert(false, ...);
     Extra diagnostics:
         false           => false
@@ -472,241 +408,207 @@ Assertion failed at integration/integration.cpp:1901: void __cdecl test_class<in
         printable{2.55} => (printable = 2.55)
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1902
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:1902: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:1902: void __cdecl test_class<int>::something_else(void):
     debug_assert([] { return false; } ());
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:1905
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [safe comparisons] =====================
-Assertion failed at integration/integration.cpp:2001: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2001: void __cdecl test_class<int>::something_else(void):
     debug_assert(18446744073709551606ULL == -10);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2002
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2002: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2002: void __cdecl test_class<int>::something_else(void):
     debug_assert(-1 > 1U);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2006
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [expression decomposition] =====================
-Assertion failed at integration/integration.cpp:2102: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2102: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 == (1 & 2));
     Where:
         (1 & 2) => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2103
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2103: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2103: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 < 1 < 0);
     Where:
         1 < 1 => false
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2104
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2104: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2104: void __cdecl test_class<int>::something_else(void):
     debug_assert(0 + 0 + 0);
     Where:
         0 + 0 + 0 => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2105
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2105: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2105: void __cdecl test_class<int>::something_else(void):
     debug_assert(false == false == false);
     Where:
         false == false => true
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2106
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2106: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2106: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 << 1 == 200);
     Where:
         1 << 1 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2107
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2107: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2107: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 << 1 << 31);
     Where:
         1 << 1 => 2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2108
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2109: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2109: void __cdecl test_class<int>::something_else(void):
     debug_assert(x -= 2);
     Where:
         x => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2110
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2111: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2111: void __cdecl test_class<int>::something_else(void):
     debug_assert(x -= x -= 1);
     Where:
         x      => 0
         x -= 1 => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2112
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2113: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2113: void __cdecl test_class<int>::something_else(void):
     debug_assert(x -= x -= x -= 1);
     Where:
         x           => 0
         x -= x -= 1 => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2114
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2114: void __cdecl test_class<int>::something_else(void): pffft
+Debug Assertion failed at integration\integration.cpp:2114: void __cdecl test_class<int>::something_else(void): pffft
     debug_assert(true ? false : true, ...);
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2115
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2116: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2116: void __cdecl test_class<int>::something_else(void):
     debug_assert(a >> 1);
     Where:
         a => 1
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2119
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [ensure values are only computed once] =====================
 foo() called
 bar() called
-Assertion failed at integration/integration.cpp:2201: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2201: void __cdecl test_class<int>::something_else(void):
     debug_assert(foo() < bar());
     Where:
         foo() => 2
         bar() => -2
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2204
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value forwarding: copy / moves] =====================
 logger_type::logger_type() [n=1]
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&) [n=1, other=2]
-Assertion failed at integration/integration.cpp:2304: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2304: void __cdecl test_class<int>::something_else(void):
     debug_assert(lt1 == lt2);
     Where:
         lt1 => logger_type [n = 1]
         lt2 => logger_type [n = 2]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2304
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
@@ -718,18 +620,16 @@ logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(int, const logger_type&) [b=1, n=2]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:2308: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2308: void __cdecl test_class<int>::something_else(void):
     debug_assert(1 == logger_type(2));
     Where:
         logger_type(2) => logger_type [n = 2]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2310
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -747,18 +647,16 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=1, b=2]
 logger_type::logger_type(logger_type&&) [n=1]
-Assertion failed at integration/integration.cpp:2312: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2312: void __cdecl test_class<int>::something_else(void):
     debug_assert(logger_type(1) == 2);
     Where:
         logger_type(1) => logger_type [n = 1]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2312
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -766,10 +664,6 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::logger_type(logger_type&&) [n=1]
-logger_type::compl logger_type() [n=-2]
-logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=1]
 --------------------------------------------
 
@@ -784,8 +678,8 @@ logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&) [n=1, other=2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:2316: void __cdecl test_class<int>::something_else(void):
-    debug_assert(logger_type(1) == logger_type(2));
+Assertion failed at integration\integration.cpp:2316: void __cdecl test_class<int>::something_else(void):
+    assert(logger_type(1) == logger_type(2));
     Where:
         logger_type(1) => logger_type [n = 1]
         logger_type(2) => logger_type [n = 2]
@@ -794,9 +688,9 @@ Stack trace:
 # 1 test_class<int>::something_else()
       at integration.cpp:2316
 # 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 3 main()
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=1]
@@ -816,30 +710,26 @@ logger_type::compl logger_type() [n=2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=1]
 logger_type::compl logger_type() [n=-2]
-Verification failed at integration/integration.cpp:2317: void __cdecl test_class<int>::something_else(void):
+Assertion failed at integration\integration.cpp:2317: void __cdecl test_class<int>::something_else(void):
     ASSERT(!(std::is_same<decltype(r), logger_type>::value));
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2318
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Verification failed at integration/integration.cpp:2318: void __cdecl test_class<int>::something_else(void):
+Assertion failed at integration\integration.cpp:2318: void __cdecl test_class<int>::something_else(void):
     ASSERT(r.n != 1);
     Where:
         r.n => 1
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2318
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=1]
@@ -848,8 +738,8 @@ logger_type::compl logger_type() [n=1]
 ===================== [value forwarding: lvalue references] =====================
 logger_type::logger_type() [n=2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
-Assertion failed at integration/integration.cpp:601: decltype(auto) __cdecl test_class<int>::get_lt_a(logger_type &):
-    debug_assert(l == 2);
+Assertion failed at integration\integration.cpp:601: decltype(auto) __cdecl test_class<int>::get_lt_a(logger_type &):
+    assert(l == 2);
     Where:
         l => logger_type [n = 2]
 
@@ -859,57 +749,51 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:2403
 # 3 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main()
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2405: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2405: void __cdecl test_class<int>::something_else(void):
     debug_assert(lt == 1);
     Where:
         lt => logger_type [n = 3]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2406
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::operator==(const logger_type&, int) [n=3, b=1]
-Assertion failed at integration/integration.cpp:2406: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2406: void __cdecl test_class<int>::something_else(void):
     debug_assert(x == 1);
     Where:
         x => logger_type [n = 3]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2406
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=3]
 --------------------------------------------
 
-Assertion failed at integration/integration.cpp:2411: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2411: void __cdecl test_class<int>::something_else(void):
     debug_assert(x ^= 1);
     Where:
         x =>  0  0b00000000000000000000000000000000
         1 =>  1  0b00000000000000000000000000000001
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2417
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [value forwarding: rvalues] =====================
@@ -920,8 +804,8 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::operator==(const logger_type&, int) [n=2, b=2]
 logger_type::logger_type(logger_type&&) [n=2]
-Assertion failed at integration/integration.cpp:605: decltype(auto) __cdecl test_class<int>::get_lt_b(void):
-    debug_assert(logger_type(2) == 2);
+Assertion failed at integration\integration.cpp:605: decltype(auto) __cdecl test_class<int>::get_lt_b(void):
+    assert(logger_type(2) == 2);
     Where:
         logger_type(2) => logger_type [n = 2]
 
@@ -931,9 +815,9 @@ Stack trace:
 # 2 test_class<int>::something_else()
       at integration.cpp:2502
 # 3 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
+      at integration.cpp:1004
 # 4 main()
-      at integration.cpp:403
+      at integration.cpp:402
 
 
 logger_type::logger_type(logger_type&&) [n=2]
@@ -947,188 +831,168 @@ logger_type::compl logger_type() [n=-2]
 logger_type::compl logger_type() [n=-2]
 logger_type::logger_type(logger_type&&) [n=2]
 logger_type::compl logger_type() [n=-2]
-Assertion failed at integration/integration.cpp:2503: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2503: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         x => logger_type [n = 2]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2503
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 logger_type::compl logger_type() [n=2]
 --------------------------------------------
 
 ===================== [simple recursion] =====================
-Assertion failed at integration/integration.cpp:501: void __cdecl rec(int):
+Debug Assertion failed at integration\integration.cpp:501: void __cdecl rec(int):
     debug_assert(false);
 
 Stack trace:
 # 1 rec(int)
-      at integration.cpp:501
-# 2 rec(int)
-      at integration.cpp:503
+      at integration.cpp:502
 |                                   |
 | 8 layers of recursion were folded |
 |                                   |
-#11 rec(int)
-      at integration.cpp:503
-#12 test_class<int>::something_else()
-      at integration.cpp:2602
-#13 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-#14 main()
-      at integration.cpp:403
+#10 rec(int)
+      at integration.cpp:502
+#11 test_class<int>::something_else()
+      at integration.cpp:2600
+#12 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+#13 main()
+      at integration.cpp:402
 
 
 ===================== [other recursion] =====================
-Assertion failed at integration/integration.cpp:508: void __cdecl recursive_a(int):
+Debug Assertion failed at integration\integration.cpp:508: void __cdecl recursive_a(int):
     debug_assert(false);
 
 Stack trace:
-# 1 recursive_a(int)
-      at integration.cpp:508
-# 2 recursive_b(int)
-      at integration.cpp:515
-# 3 recursive_a(int)
-      at integration.cpp:510
-# 4 recursive_b(int)
-      at integration.cpp:515
-# 5 recursive_a(int)
-      at integration.cpp:510
-# 6 recursive_b(int)
-      at integration.cpp:515
-# 7 recursive_a(int)
-      at integration.cpp:510
-# 8 recursive_b(int)
-      at integration.cpp:515
-# 9 recursive_a(int)
-      at integration.cpp:510
-#10 recursive_b(int)
-      at integration.cpp:515
-#11 recursive_a(int)
-      at integration.cpp:510
-#12 test_class<int>::something_else()
-      at integration.cpp:2703
-#13 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-#14 main()
-      at integration.cpp:403
+# 1 recursive_b(int)
+      at integration.cpp:514
+# 2 recursive_a(int)
+      at integration.cpp:509
+# 3 recursive_b(int)
+      at integration.cpp:514
+# 4 recursive_a(int)
+      at integration.cpp:509
+# 5 recursive_b(int)
+      at integration.cpp:514
+# 6 recursive_a(int)
+      at integration.cpp:509
+# 7 recursive_b(int)
+      at integration.cpp:514
+# 8 recursive_a(int)
+      at integration.cpp:509
+# 9 recursive_b(int)
+      at integration.cpp:514
+#10 recursive_a(int)
+      at integration.cpp:509
+#11 test_class<int>::something_else()
+      at integration.cpp:2700
+#12 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+#13 main()
+      at integration.cpp:402
 
 
 ===================== [Path differentiation] =====================
-Assertion failed at integration/x/a.cpp:5: void __cdecl test_path_differentiation_2(void):
+Debug Assertion failed at integration\x\a.cpp:5: void __cdecl test_path_differentiation_2(void):
     debug_assert(false);
 
 Stack trace:
-# 1 test_path_differentiation_2()
-      at x/a.cpp:6
-# 2 test_path_differentiation()
-      at integration/a.cpp:8
-# 3 test_class<int>::something_else()
-      at integration.cpp:2801
-# 4 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 5 main()
-      at integration.cpp:403
+# 1 test_path_differentiation()
+      at a.cpp:7
+# 2 test_class<int>::something_else()
+      at integration.cpp:2800
+# 3 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 4 main()
+      at integration.cpp:402
 
 
 ===================== [Enum handling] =====================
-Assertion failed at integration/integration.cpp:2904: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2904: void __cdecl test_class<int>::something_else(void):
     debug_assert(a != A);
     Where:
         a => 0
         A => 0
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2905
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:2906: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:2906: void __cdecl test_class<int>::something_else(void):
     debug_assert(b != bar::A);
     Where:
         b      => A
         bar::A => A
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:2909
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [Literal format handling] =====================
-Assertion failed at integration/integration.cpp:3001: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3001: void __cdecl test_class<int>::something_else(void):
     debug_assert(0xff == 077);
     Where:
         0xff =>  255  0xff  0377
         077  =>  63   0x3f  077
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3002
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3002: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3002: void __cdecl test_class<int>::something_else(void):
     debug_assert('x' == 20);
     Where:
         'x' =>  'x'     120
         20  =>  '\x14'  20
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3003
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3003: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3003: void __cdecl test_class<int>::something_else(void):
     debug_assert('x' == 'y');
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3004
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3005: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3005: void __cdecl test_class<int>::something_else(void):
     debug_assert(c == 20);
     Where:
         c  =>  'x'     120
         20 =>  '\x14'  20
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3007
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [Container printing] =====================
-Assertion failed at integration/integration.cpp:3104: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3104: void __cdecl test_class<int>::something_else(void):
     debug_assert(a == b, ...);
     Where:
         a => std::set<int, std::less<int>> [size: 4]: [2, 4, 6, 10]
@@ -1137,104 +1001,90 @@ Assertion failed at integration/integration.cpp:3104: void __cdecl test_class<in
         c => std::vector<double> [size: 4]: [1.2000000476837158, 2.440000057220459, 3.15159010887146, 5.1999998092651367]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3105
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3109: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3109: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         m0 => std::map<std::string, int, std::less<std::string>> [size: 2]: [["bar", -2], ["foo", 2]]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3110
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3114: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3114: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         m1 => std::map<std::string, std::vector<int>, std::less<std::string>> [size: 2]: [["bar", [-100, 200, 400, -800]], ["foo", [1, -2, 3, -4]]]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3115
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3116: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3116: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         t => std::tuple<int, double, char const *>: [1, 0.30000000000000004, "foobars"]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3117
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3118: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3118: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         arr => std::array<int, 10> [size: 10]: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3119
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
-Assertion failed at integration/integration.cpp:3120: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3120: void __cdecl test_class<int>::something_else(void):
     debug_assert(false, ...);
     Extra diagnostics:
         carr => int[5] [size: 5]: [5, 4, 3, 2, 1]
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3120
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [Type cleaning] =====================
-Assertion failed at integration/integration.cpp:3305: void __cdecl test_class<int>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>, std::less<std::string>> &):
+Debug Assertion failed at integration\integration.cpp:3305: void __cdecl test_class<int>::test_pretty_function_cleaning(const std::map<std::string, std::vector<std::string_view>, std::less<std::string>> &):
     debug_assert(map == other);
     Where:
         map   => std::map<std::string, std::vector<std::string_view>, std::less<std::string>> [size: 2]: [["bar", ["b1", "b3", "b5"]], ["foo", ["f1", "f3", "f5"]]]
         other => std::map<std::string, std::vector<std::string_view>, std::less<std::string>> [size: 0]: []
 
 Stack trace:
-# 1 test_class<int>::test_pretty_function_cleaning(std::map<std::string, std::vector<std::string_view>, std::less<std::string>>&)
-      at integration.cpp:3305
-# 2 test_class<int>::something_else()
+# 1 test_class<int>::something_else()
       at integration.cpp:3201
-# 3 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 4 main()
-      at integration.cpp:403
+# 2 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 3 main()
+      at integration.cpp:402
 
 
 ===================== [Debug stringification customization point] =====================
-Assertion failed at integration/integration.cpp:3402: void __cdecl test_class<int>::something_else(void):
+Debug Assertion failed at integration\integration.cpp:3402: void __cdecl test_class<int>::something_else(void):
     debug_assert(x == y, ...);
     Where:
         x => (debug_print_customization = 2)
@@ -1244,26 +1094,22 @@ Assertion failed at integration/integration.cpp:3402: void __cdecl test_class<in
         y => (debug_print_customization = 1)
 
 Stack trace:
-# 1 test_class<int>::something_else()
-      at integration.cpp:3405
-# 2 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 3 main()
-      at integration.cpp:403
+# 1 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 2 main()
+      at integration.cpp:402
 
 
 ===================== [Complex type resolution] =====================
-Assertion failed at integration/integration.cpp:3602: void __cdecl test_class<int>::test_complex_typing(volatile const std::vector<std::string> *const &, int [], const char (&)[4], void (__cdecl complex_typing::S::* )(int, std::string, void ***, void *(__cdecl *)(int), void (__cdecl *(__cdecl *)(int))(void), void (__cdecl *(*(__cdecl *)(int))[5])(void)), int complex_typing::S::* ):
+Debug Assertion failed at integration\integration.cpp:3602: void __cdecl test_class<int>::test_complex_typing(volatile const std::vector<std::string> *const &, int [], const char (&)[4], void (__cdecl complex_typing::S::* )(int, std::string, void ***, void *(__cdecl *)(int), void (__cdecl *(__cdecl *)(int))(void), void (__cdecl *(*(__cdecl *)(int))[5])(void)), int complex_typing::S::* ):
     debug_assert(false);
 
 Stack trace:
-# 1 test_class<int>::test_complex_typing(std::vector<std::string>*&, int*, char(&)[4], void(complex_typing::S::*)(int, std::string, void***, void*(*)(int), void(*(*)(int))(), void(*(*(*)(int))[5])()), int complex_typing::S::*)
-      at integration.cpp:3603
-# 2 test_class<int>::something_else()
-      at integration.cpp:3504
-# 3 test_class<int>::something<N>(std::pair<N, int>)
-      at integration.cpp:1005
-# 4 main()
-      at integration.cpp:403
+# 1 test_class<int>::something_else()
+      at integration.cpp:3502
+# 2 test_class<int>::something<N>(std::pair<N, int>)
+      at integration.cpp:1004
+# 3 main()
+      at integration.cpp:402
 
 
diff --git a/tests/pyutils/utils.py b/tests/pyutils/utils.py
index ea578178..6e860900 100644
--- a/tests/pyutils/utils.py
+++ b/tests/pyutils/utils.py
@@ -41,7 +41,7 @@ def parse_output(output: str):
             # read until blank line
             while i < len(output_lines) and output_lines[i] != "":
                 line = output_lines[i]
-                if re.match(r"^\w+ failed at .+\.cpp:\d+: .+$", line):
+                if re.match(r"^.+ failed at .+\.cpp:\d+: .+$", line):
                     line = re.sub(r"(?<= failed at ).+\.cpp(?=:\d+: .+$)", "integration/integration.cpp", line)
                 e["lines"].append(line)
                 i += 1
diff --git a/tests/unit/tokens_and_highlighting.cpp b/tests/unit/tokens_and_highlighting.cpp
index f8fc6d38..3ce1986e 100644
--- a/tests/unit/tokens_and_highlighting.cpp
+++ b/tests/unit/tokens_and_highlighting.cpp
@@ -6,7 +6,7 @@
 #include <assert/assert.hpp>
 
 namespace libassert::detail {
-    [[nodiscard]] std::string highlight(const std::string& expression);
+    [[nodiscard]] LIBASSERT_EXPORT std::string highlight(const std::string& expression);
 }
 
 int main() {