diff -ru test/disable_both/old_expected/02340_n_run_isok_queries_raise_sql_statement_not_yet_complete.out test/disable_both/expected/02340_n_run_isok_queries_raise_sql_statement_not_yet_complete.out
--- test/disable_both/old_expected/02340_n_run_isok_queries_raise_sql_statement_not_yet_complete.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02340_n_run_isok_queries_raise_sql_statement_not_yet_complete.out	2025-06-09 16:07:34.748677002 -0500
@@ -32,6 +32,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02350_n_run_isok_queries_raise_feature_not_supported.out test/disable_both/expected/02350_n_run_isok_queries_raise_feature_not_supported.out
--- test/disable_both/old_expected/02350_n_run_isok_queries_raise_feature_not_supported.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02350_n_run_isok_queries_raise_feature_not_supported.out	2025-06-09 16:07:34.832676996 -0500
@@ -31,6 +31,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02360_n_run_isok_queries_data_exception.out test/disable_both/expected/02360_n_run_isok_queries_data_exception.out
--- test/disable_both/old_expected/02360_n_run_isok_queries_data_exception.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02360_n_run_isok_queries_data_exception.out	2025-06-09 16:07:34.916676990 -0500
@@ -31,6 +31,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02370_n_run_isok_queries_integrity_constraint_violation.out test/disable_both/expected/02370_n_run_isok_queries_integrity_constraint_violation.out
--- test/disable_both/old_expected/02370_n_run_isok_queries_integrity_constraint_violation.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02370_n_run_isok_queries_integrity_constraint_violation.out	2025-06-09 16:07:35.000676985 -0500
@@ -32,6 +32,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02380_n_run_isok_queries_invalid_sql_statement_name.out test/disable_both/expected/02380_n_run_isok_queries_invalid_sql_statement_name.out
--- test/disable_both/old_expected/02380_n_run_isok_queries_invalid_sql_statement_name.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02380_n_run_isok_queries_invalid_sql_statement_name.out	2025-06-09 16:07:35.084676980 -0500
@@ -31,6 +31,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02390_n_run_isok_queries_sql_routine_exception.out test/disable_both/expected/02390_n_run_isok_queries_sql_routine_exception.out
--- test/disable_both/old_expected/02390_n_run_isok_queries_sql_routine_exception.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02390_n_run_isok_queries_sql_routine_exception.out	2025-06-09 16:07:35.168676975 -0500
@@ -31,6 +31,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02400_n_run_isok_queries_syntax_error_or_access_rule_violation.out test/disable_both/expected/02400_n_run_isok_queries_syntax_error_or_access_rule_violation.out
--- test/disable_both/old_expected/02400_n_run_isok_queries_syntax_error_or_access_rule_violation.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02400_n_run_isok_queries_syntax_error_or_access_rule_violation.out	2025-06-09 16:07:35.252676970 -0500
@@ -32,6 +32,6 @@
 
 Additional diagnostic information:
 PL/pgSQL function test_func() line 3 at RAISE
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
diff -ru test/disable_both/old_expected/02410_n_run_isok_queries_bad_iqname.out test/disable_both/expected/02410_n_run_isok_queries_bad_iqname.out
--- test/disable_both/old_expected/02410_n_run_isok_queries_bad_iqname.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02410_n_run_isok_queries_bad_iqname.out	2025-06-09 16:07:35.328676964 -0500
@@ -14,5 +14,5 @@
 VALUES ('non_existant_iqname')
 
 Additional diagnostic information:
-PL/pgSQL function run_isok_queries(text) line 68 at RAISE
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 422 at RAISE
+PL/pgSQL function run_isok_queries(text) line 58 at RAISE
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 288 at RAISE
diff -ru test/disable_both/old_expected/02600_n_run_isok_queries_bad_query.out test/disable_both/expected/02600_n_run_isok_queries_bad_query.out
--- test/disable_both/old_expected/02600_n_run_isok_queries_bad_query.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02600_n_run_isok_queries_bad_query.out	2025-06-09 16:07:35.428676958 -0500
@@ -20,8 +20,8 @@
 bad sql;
 
 Additional diagnostic information:
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
 -- Cleanup
 -- Reset the sequence so what this test did is ignored.
diff -ru test/disable_both/old_expected/02630_n_run_isok_queries_bad_qr_extra.out test/disable_both/expected/02630_n_run_isok_queries_bad_qr_extra.out
--- test/disable_both/old_expected/02630_n_run_isok_queries_bad_qr_extra.out	2025-06-09 16:07:25.940677555 -0500
+++ test/disable_both/expected/02630_n_run_isok_queries_bad_qr_extra.out	2025-06-09 16:07:35.516676953 -0500
@@ -28,8 +28,8 @@
 
 Additional diagnostic information:
 JSON data, line 1: "
-PL/pgSQL function run_isok_queries(text) line 183 at FOR over EXECUTE statement
-CONTEXT:  PL/pgSQL function run_isok_queries(text) line 397 at RAISE
+PL/pgSQL function run_isok_queries(text) line 71 at FOR over EXECUTE statement
+CONTEXT:  PL/pgSQL function run_isok_queries(text) line 263 at RAISE
 ROLLBACK;
 -- Cleanup
 -- Reset the sequence so what this test did is ignored.