diff --git a/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-check.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-check.cpp.execution
index 8474b91594..33edef59f9 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+../../../include/cpp2util.h(729) decltype(auto) cpp2::impl::assert_in_bounds(auto &&, std::source_location) [arg = 5, x:auto = std::vector<int>]: Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..351026bdaf 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+../../../include/cpp2util.h(590) : Bounds safety violation
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..7af70a4022 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+../../../include/cpp2util.h(590) : Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..50447bed2c 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: ../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]]
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-expected-not-null.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-expected-not-null.cpp.execution
index 8887aa1aa4..7ef489217b 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-expected-not-null.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-expected-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::expected has an unexpected value
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::expected<int, bool>]: Null safety violation: std::expected has an unexpected value
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..a7efa13281 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::optional<int>]: Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..92ea0d4062 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::shared_ptr<int>]: Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..6d94ee858b 100644
--- a/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/apple-clang-15-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::unique_ptr<int> &]: Null safety violation: std::unique_ptr is empty
diff --git a/regression-tests/test-results/clang-15-c++20/mixed-bounds-check.cpp.execution b/regression-tests/test-results/clang-15-c++20/mixed-bounds-check.cpp.execution
index 8474b91594..33edef59f9 100644
--- a/regression-tests/test-results/clang-15-c++20/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+../../../include/cpp2util.h(729) decltype(auto) cpp2::impl::assert_in_bounds(auto &&, std::source_location) [arg = 5, x:auto = std::vector<int>]: Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/clang-15-c++20/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/clang-15-c++20/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..351026bdaf 100644
--- a/regression-tests/test-results/clang-15-c++20/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+../../../include/cpp2util.h(590) : Bounds safety violation
diff --git a/regression-tests/test-results/clang-15-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/clang-15-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..7af70a4022 100644
--- a/regression-tests/test-results/clang-15-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+../../../include/cpp2util.h(590) : Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..50447bed2c 100644
--- a/regression-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: ../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = int *&]]
diff --git a/regression-tests/test-results/clang-15-c++20/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/clang-15-c++20/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..a7efa13281 100644
--- a/regression-tests/test-results/clang-15-c++20/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::optional<int>]: Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/clang-15-c++20/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-15-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..92ea0d4062 100644
--- a/regression-tests/test-results/clang-15-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::shared_ptr<int>]: Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/clang-15-c++20/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-15-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..6d94ee858b 100644
--- a/regression-tests/test-results/clang-15-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-15-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+../../../include/cpp2util.h(669) decltype(auto) cpp2::impl::assert_not_null(auto &&, std::source_location) [arg:auto = std::unique_ptr<int> &]: Null safety violation: std::unique_ptr is empty
diff --git a/regression-tests/test-results/clang-18-c++20/mixed-bounds-check.cpp.execution b/regression-tests/test-results/clang-18-c++20/mixed-bounds-check.cpp.execution
index 8474b91594..e8f4c97d0a 100644
--- a/regression-tests/test-results/clang-18-c++20/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+mixed-bounds-check.cpp2(9) int main(): Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/clang-18-c++20/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/clang-18-c++20/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..9625012ba7 100644
--- a/regression-tests/test-results/clang-18-c++20/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+mixed-bounds-safety-with-assert.cpp2(11) void print_subrange(const auto &, cpp2::impl::in<int>, cpp2::impl::in<int>) [rng:auto = std::vector<int>]: Bounds safety violation
diff --git a/regression-tests/test-results/clang-18-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/clang-18-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..a27e55f1a5 100644
--- a/regression-tests/test-results/clang-18-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+mixed-initialization-safety-3-contract-violation.cpp2(25) void fill(cpp2::impl::out<std::string>, cpp2::impl::in<std::string>, cpp2::impl::in<int>): Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..4ec0f5de65 100644
--- a/regression-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
diff --git a/regression-tests/test-results/clang-18-c++20/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++20/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..d474aedd2f 100644
--- a/regression-tests/test-results/clang-18-c++20/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+pure2-assert-optional-not-null.cpp2(14) int bad_optional_access(): Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/clang-18-c++20/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..0f68ae7f5d 100644
--- a/regression-tests/test-results/clang-18-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+pure2-assert-shared-ptr-not-null.cpp2(15) int bad_shared_ptr_access(): Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/clang-18-c++20/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..02f6a77417 100644
--- a/regression-tests/test-results/clang-18-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+pure2-assert-unique-ptr-not-null.cpp2(15) int bad_unique_ptr_access(): Null safety violation: std::unique_ptr is empty
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-check.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-check.cpp.execution
index 8474b91594..e8f4c97d0a 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+mixed-bounds-check.cpp2(9) int main(): Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..9625012ba7 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+mixed-bounds-safety-with-assert.cpp2(11) void print_subrange(const auto &, cpp2::impl::in<int>, cpp2::impl::in<int>) [rng:auto = std::vector<int>]: Bounds safety violation
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..a27e55f1a5 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+mixed-initialization-safety-3-contract-violation.cpp2(25) void fill(cpp2::impl::out<std::string>, cpp2::impl::in<std::string>, cpp2::impl::in<int>): Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..4ec0f5de65 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-expected-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-expected-not-null.cpp.execution
index 8887aa1aa4..6e890f66c8 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-expected-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-expected-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::expected has an unexpected value
+pure2-assert-expected-not-null.cpp2(15) int bad_expected_access(): Null safety violation: std::expected has an unexpected value
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..d474aedd2f 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+pure2-assert-optional-not-null.cpp2(14) int bad_optional_access(): Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..0f68ae7f5d 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+pure2-assert-shared-ptr-not-null.cpp2(15) int bad_shared_ptr_access(): Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..02f6a77417 100644
--- a/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/clang-18-c++23-libcpp/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+pure2-assert-unique-ptr-not-null.cpp2(15) int bad_unique_ptr_access(): Null safety violation: std::unique_ptr is empty
diff --git a/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-check.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-check.cpp.execution
index 8474b91594..e8f4c97d0a 100644
--- a/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+mixed-bounds-check.cpp2(9) int main(): Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..df39b9060b 100644
--- a/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+mixed-bounds-safety-with-assert.cpp2(11) void print_subrange(const auto:95&, cpp2::impl::in<int>, cpp2::impl::in<int>) [with auto:95 = std::vector<int>; cpp2::impl::in<int> = const int]: Bounds safety violation
diff --git a/regression-tests/test-results/gcc-13-c++2b/mixed-bugfix-for-ufcs-non-local.cpp.output b/regression-tests/test-results/gcc-13-c++2b/mixed-bugfix-for-ufcs-non-local.cpp.output
index 29f4cc1e2b..2ae5e2ce89 100644
--- a/regression-tests/test-results/gcc-13-c++2b/mixed-bugfix-for-ufcs-non-local.cpp.output
+++ b/regression-tests/test-results/gcc-13-c++2b/mixed-bugfix-for-ufcs-non-local.cpp.output
@@ -1,41 +1,41 @@
 In file included from mixed-bugfix-for-ufcs-non-local.cpp:6:
 ../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
- 2100 | template<typename T>
+ 2100 | {
       | ^
 ../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
- 2137 | class c_raii {
+ 2137 | //  Speculative: RAII wrapping for the C standard library
       |                                                           ^         
 mixed-bugfix-for-ufcs-non-local.cpp2:13:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:13:36: error: template argument 1 is invalid
 ../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
- 2100 | template<typename T>
+ 2100 | {
       | ^
 ../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
- 2137 | class c_raii {
+ 2137 | //  Speculative: RAII wrapping for the C standard library
       |                                                           ^         
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
 ../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
- 2100 | template<typename T>
+ 2100 | {
       | ^
 ../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
- 2137 | class c_raii {
+ 2137 | //  Speculative: RAII wrapping for the C standard library
       |                                                           ^         
 mixed-bugfix-for-ufcs-non-local.cpp2:31:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:31:36: error: template argument 1 is invalid
 ../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
- 2100 | template<typename T>
+ 2100 | {
       | ^
 ../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
- 2137 | class c_raii {
+ 2137 | //  Speculative: RAII wrapping for the C standard library
       |                                                           ^         
 mixed-bugfix-for-ufcs-non-local.cpp2:33:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:33:36: error: template argument 1 is invalid
 ../../../include/cpp2util.h:2100:1: error: lambda-expression in template parameter type
- 2100 | template<typename T>
+ 2100 | {
       | ^
 ../../../include/cpp2util.h:2137:59: note: in expansion of macro ‘CPP2_UFCS_’
- 2137 | class c_raii {
+ 2137 | //  Speculative: RAII wrapping for the C standard library
       |                                                           ^         
 mixed-bugfix-for-ufcs-non-local.cpp2:21:12: note: in expansion of macro ‘CPP2_UFCS_NONLOCAL’
 mixed-bugfix-for-ufcs-non-local.cpp2:21:36: error: template argument 1 is invalid
diff --git a/regression-tests/test-results/gcc-13-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..818a56397d 100644
--- a/regression-tests/test-results/gcc-13-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+mixed-initialization-safety-3-contract-violation.cpp2(25) void fill(cpp2::impl::out<std::__cxx11::basic_string<char> >, cpp2::impl::in<std::__cxx11::basic_string<char> >, cpp2::impl::in<int>): Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..4ec0f5de65 100644
--- a/regression-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void try_pointer_stuff()]
diff --git a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-expected-not-null.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-expected-not-null.cpp.execution
index 8887aa1aa4..6e890f66c8 100644
--- a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-expected-not-null.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-expected-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::expected has an unexpected value
+pure2-assert-expected-not-null.cpp2(15) int bad_expected_access(): Null safety violation: std::expected has an unexpected value
diff --git a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..d474aedd2f 100644
--- a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+pure2-assert-optional-not-null.cpp2(14) int bad_optional_access(): Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..0f68ae7f5d 100644
--- a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+pure2-assert-shared-ptr-not-null.cpp2(15) int bad_shared_ptr_access(): Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..02f6a77417 100644
--- a/regression-tests/test-results/gcc-13-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/gcc-13-c++2b/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+pure2-assert-unique-ptr-not-null.cpp2(15) int bad_unique_ptr_access(): Null safety violation: std::unique_ptr is empty
diff --git a/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-check.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-check.cpp.execution
index 8474b91594..21fc34982f 100644
--- a/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-check.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-check.cpp.execution
@@ -1 +1 @@
-Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
+mixed-bounds-check.cpp2(9) int __cdecl main(void): Bounds safety violation: out of bounds access attempt detected - attempted access at index 5, [min,max] range is [0,4]
diff --git a/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-safety-with-assert.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-safety-with-assert.cpp.execution
index 776dc1460f..660c8ae71b 100644
--- a/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-safety-with-assert.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/mixed-bounds-safety-with-assert.cpp.execution
@@ -1 +1 @@
-Bounds safety violation
+mixed-bounds-safety-with-assert.cpp2(11) void __cdecl print_subrange<class std::vector<int,class std::allocator<int> >>(const class std::vector<int,class std::allocator<int> > &,const int,const int): Bounds safety violation
diff --git a/regression-tests/test-results/msvc-2022-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
index e16104fe58..0d9bbc59c1 100644
--- a/regression-tests/test-results/msvc-2022-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/mixed-initialization-safety-3-contract-violation.cpp.execution
@@ -1 +1 @@
-Contract violation: fill: value must contain at least count elements
+mixed-initialization-safety-3-contract-violation.cpp2(25) void __cdecl fill(class cpp2::impl::out<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > >,const class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > &,const int): Contract violation: fill: value must contain at least count elements
diff --git a/regression-tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
index f4dd62312e..762c9ea2c4 100644
--- a/regression-tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/mixed-lifetime-safety-and-null-contracts.cpp.execution
@@ -1 +1,2 @@
 sending error to my framework... [dynamic null dereference attempt detected]
+from source location: mixed-lifetime-safety-and-null-contracts.cpp2(17) void __cdecl try_pointer_stuff(void)]
diff --git a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output
index 130dae05d2..86ab24cc95 100644
--- a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output
+++ b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-expected-not-null.cpp.output
@@ -6,7 +6,7 @@ pure2-assert-expected-not-null.cpp2(7): error C2143: syntax error: missing ';' b
 pure2-assert-expected-not-null.cpp2(7): error C2143: syntax error: missing ';' before '}'
 pure2-assert-expected-not-null.cpp2(9): error C2065: 'ex': undeclared identifier
 pure2-assert-expected-not-null.cpp2(9): error C2672: 'cpp2::impl::assert_not_null': no matching overloaded function found
-..\..\..\include\cpp2util.h(665): note: could be 'decltype(auto) cpp2::impl::assert_not_null(_T0 &&)'
+..\..\..\include\cpp2util.h(669): note: could be 'decltype(auto) cpp2::impl::assert_not_null(_T0 &&,std::source_location)'
 pure2-assert-expected-not-null.cpp2(14): error C2039: 'expected': is not a member of 'std'
 predefined C++ types (compiler internal)(347): note: see declaration of 'std'
 pure2-assert-expected-not-null.cpp2(14): error C2062: type 'int' unexpected
@@ -19,4 +19,4 @@ pure2-assert-expected-not-null.cpp2(14): note: while trying to match the argumen
 pure2-assert-expected-not-null.cpp2(14): error C2143: syntax error: missing ';' before '}'
 pure2-assert-expected-not-null.cpp2(15): error C2065: 'ex': undeclared identifier
 pure2-assert-expected-not-null.cpp2(15): error C2672: 'cpp2::impl::assert_not_null': no matching overloaded function found
-..\..\..\include\cpp2util.h(665): note: could be 'decltype(auto) cpp2::impl::assert_not_null(_T0 &&)'
+..\..\..\include\cpp2util.h(669): note: could be 'decltype(auto) cpp2::impl::assert_not_null(_T0 &&,std::source_location)'
diff --git a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-optional-not-null.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-optional-not-null.cpp.execution
index c6aeba0fde..c1596fc1d3 100644
--- a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-optional-not-null.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-optional-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::optional does not contain a value
+pure2-assert-optional-not-null.cpp2(14) int __cdecl bad_optional_access(void): Null safety violation: std::optional does not contain a value
diff --git a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-shared-ptr-not-null.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
index 85aafbe6a1..a346429451 100644
--- a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-shared-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::shared_ptr is empty
+pure2-assert-shared-ptr-not-null.cpp2(15) int __cdecl bad_shared_ptr_access(void): Null safety violation: std::shared_ptr is empty
diff --git a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-unique-ptr-not-null.cpp.execution b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
index af633d171a..ade26745ab 100644
--- a/regression-tests/test-results/msvc-2022-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
+++ b/regression-tests/test-results/msvc-2022-c++20/pure2-assert-unique-ptr-not-null.cpp.execution
@@ -1 +1 @@
-Null safety violation: std::unique_ptr is empty
+pure2-assert-unique-ptr-not-null.cpp2(15) int __cdecl bad_unique_ptr_access(void): Null safety violation: std::unique_ptr is empty