From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 29 Dec 2022 17:14:31 +0000 (+0000)
Subject: Debug: quieten environment-cleaning
X-Git-Tag: exim-4.97-RC0~162
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e?hp=6fc54bd18aa7a51e11dce5a905e754cedb526230

Debug: quieten environment-cleaning
---

diff --git a/src/src/environment.c b/src/src/environment.c
index 68adf3c0c..b05b1aefd 100644
--- a/src/src/environment.c
+++ b/src/src/environment.c
@@ -4,6 +4,7 @@
 
 /* Copyright (c) Heiko Schlittermann 2016
  * hs@schlittermann.de
+ * Copyright (c) The Exim Maintainers 2022
  * See the file NOTICE for conditions of use and distribution.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -25,10 +26,7 @@ Returns:    TRUE if successful
 BOOL
 cleanup_environment()
 {
-int old_pool = store_pool;
-store_pool = POOL_PERM;		/* Need perm memory for any created env vars */
-
-if (!keep_environment || *keep_environment == '\0')
+if (!keep_environment || !*keep_environment)
   {
   /* From: https://github.com/dovecot/core/blob/master/src/lib/env-util.c#L55
   Try to clear the environment.
@@ -43,6 +41,11 @@ if (!keep_environment || *keep_environment == '\0')
 else if (Ustrcmp(keep_environment, "*") != 0)
   {
   rmark reset_point = store_mark();
+  unsigned deb = debug_selector;
+  BOOL hc = host_checking;
+  debug_selector = 0;			/* quieten this clearout */
+  host_checking = FALSE;
+
   if (environ) for (uschar ** p = USS environ; *p; /* see below */)
     {
     /* It's considered broken if we do not find the '=', according to
@@ -54,31 +57,42 @@ else if (Ustrcmp(keep_environment, "*") != 0)
       {
       uschar * name = string_copyn(*p, eqp - *p);
 
-      if (OK != match_isinlist(name, CUSS &keep_environment,
-          0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
-        if (os_unsetenv(name) < 0) return FALSE;
-        else p = USS environ; /* RESTART from the beginning */
-      else p++;
+      if (match_isinlist(name, CUSS &keep_environment,
+          0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL) == OK)
+	p++;			/* next */
+      else if (os_unsetenv(name) == 0)
+	p = USS environ;	/* RESTART from the beginning */
+      else
+	{ debug_selector = deb; host_checking = hc; return FALSE; }
       }
     }
+  debug_selector = deb;
+  host_checking = hc;
   store_reset(reset_point);
   }
+DEBUG(D_expand)
+  {
+  debug_printf("environment after trimming:\n");
+  if (environ) for (uschar ** p = USS environ; *p; p++)
+    debug_printf(" %s\n", *p);
+  }
 if (add_environment)
   {
-  uschar * p;
   int sep = 0;
   const uschar * envlist = add_environment;
+  int old_pool = store_pool;
+  store_pool = POOL_PERM;		/* Need perm memory for any created env vars */
 
-  while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
+  for (const uschar * p; p = string_nextinlist(&envlist, &sep, NULL, 0); )
     {
     DEBUG(D_expand) debug_printf("adding %s\n", p);
     putenv(CS p);
     }
+  store_pool = old_pool;
   }
 #ifndef DISABLE_TLS
 tls_clean_env();
 #endif
 
-store_pool = old_pool;
 return TRUE;
 }
diff --git a/test/runtest b/test/runtest
index 62df0b93d..b9bcde89e 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1464,6 +1464,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/^(\d\d:\d\d:\d\d\s+)(\d+)/$1 . new_value($2, "p%s", \$next_pid) . " "/mgxe;
     s/(?<!post-)[Pp]rocess\K(\s\d+ )/new_value($1, "p%s", \$next_pid) . " "/gxe;
 
+    # Path in environment varies
+    s/^ PATH=\K.*$/<munged>/;
+
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to
diff --git a/test/stderr/0002 b/test/stderr/0002
index 6505e3155..23719fc5b 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -1,4 +1,6 @@
 Exim version x.yz ....
+environment after trimming:
+ USER=CALLER
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -134,6 +136,8 @@ LOG: MAIN PANIC
  ╰─────result: match_address:   no
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ USER=CALLER
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -263,6 +267,8 @@ LOG: MAIN PANIC
  \_____result: match_address:   no
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ USER=CALLER
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -321,6 +327,8 @@ dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13
 Exim version x.yz ....
+environment after trimming:
+ USER=CALLER
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -421,28 +429,6 @@ sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me)
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-SHELL in keep_environment?
- list element: USER
-EXIM_TEST_NUMBER in keep_environment?
- list element: USER
-PWD in keep_environment?
- list element: USER
-TERM in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-SHLVL in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-PATH in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-_ in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -507,28 +493,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1239
-SHELL in keep_environment?
- list element: USER
-EXIM_TEST_NUMBER in keep_environment?
- list element: USER
-PWD in keep_environment?
- list element: USER
-TERM in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-SHLVL in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-PATH in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-_ in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -734,28 +698,6 @@ LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=p1240
-SHELL in keep_environment?
- list element: USER
-EXIM_TEST_NUMBER in keep_environment?
- list element: USER
-PWD in keep_environment?
- list element: USER
-TERM in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-SHLVL in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-PATH in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
-_ in keep_environment?
- list element: USER
-USER in keep_environment?
- list element: USER
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0021 b/test/stderr/0021
index 18ed27f0c..6c9d189b3 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -1,29 +1,4 @@
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -184,31 +159,6 @@ LOG: smtp_connection MAIN
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -336,13 +286,6 @@ end of ACL "rcpt": ACCEPT
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/0022 b/test/stderr/0022
index a9e4457fc..c04f4002b 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -108,31 +83,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -218,31 +168,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
diff --git a/test/stderr/0038 b/test/stderr/0038
index 7d1ca99e6..4090b5938 100644
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -12,6 +12,8 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -60,6 +62,8 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -107,6 +111,8 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -155,6 +161,8 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -202,6 +210,8 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -278,6 +288,8 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
 >>>  list element: @
 >>>  list element: @[]
 >>> test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/0043 b/test/stderr/0043
index 0d298dd30..9a1b19a0d 100644
--- a/test/stderr/0043
+++ b/test/stderr/0043
@@ -12,6 +12,8 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/0044 b/test/stderr/0044
index 9d9c5998f..06337c586 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -59,6 +34,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
 sender_fullhost = (exim.test.ex) [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (helo=exim.test.ex)
 set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.11.12.13]
+host in limits_advertise_hosts?
+ list element: !*
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
@@ -213,6 +190,8 @@ search_tidyup called
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -248,31 +227,6 @@ LOG: 10HmaY-0005vi-00 <= myfriend@there.test.ex H=(exim.test.ex) [V4NET.11.12.13
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -306,6 +260,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
 sender_fullhost = (exim.test.ex) [V4NET.99.99.99]
 sender_rcvhost = [V4NET.99.99.99] (helo=exim.test.ex)
 set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.99.99.99]
+host in limits_advertise_hosts?
+ list element: !*
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
diff --git a/test/stderr/0067 b/test/stderr/0067
index 58b47ea98..595d2ad64 100644
--- a/test/stderr/0067
+++ b/test/stderr/0067
@@ -6,1111 +6,1319 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> somehost.example.com in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> somehost.example.com in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> somehost.example.com in "bbb.ccc"? no (end of list)
+>>> userx@somehost.example.com in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  somehost.example.com in "b.c"?
+>>>   list element: b.c
+>>>  somehost.example.com in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  somehost.example.com in "bb.cc"?
+>>>   list element: bb.cc
+>>>  somehost.example.com in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  somehost.example.com in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  somehost.example.com in "bbb.ccc"? no (end of list)
 >>> userx@somehost.example.com in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> userx@somehost.example.com in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> userx@somehost.example.com in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: b.c
->>> b.c in "b.c"? yes (matched "b.c")
->>> x@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!x@b.c")
+>>> x@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  b.c in "b.c"?
+>>>   list element: b.c
+>>>   b.c in "b.c"? yes (matched "b.c")
+>>>  x@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!x@b.c")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> x@b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> x@b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> b.c in "b.c"? yes (matched "b.c")
->>> y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c")
+>>> y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  b.c in "b.c"?
+>>>   list element: b.c
+>>>   b.c in "b.c"? yes (matched "b.c")
+>>>  y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> xy.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
+>>> philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  xy.z in "b.c"?
+>>>   list element: b.c
+>>>  xy.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> patch.work in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
+>>> quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  patch.work in "b.c"?
+>>>   list element: b.c
+>>>  patch.work in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> a.b.c in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> philip@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!^philip@a.b.c")
+>>> philip@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  a.b.c in "b.c"?
+>>>   list element: b.c
+>>>  a.b.c in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  philip@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!^philip@a.b.c")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> philip@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> philip@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> abc.def in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
+>>> xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  abc.def in "b.c"?
+>>>   list element: b.c
+>>>  abc.def in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> d.e.f in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
+>>> abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  d.e.f in "b.c"?
+>>>   list element: b.c
+>>>  d.e.f in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> d.e.f in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> d.e.f in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> d.e.f in "bbb.ccc"? no (end of list)
+>>> xyz@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  d.e.f in "b.c"?
+>>>   list element: b.c
+>>>  d.e.f in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  d.e.f in "bb.cc"?
+>>>   list element: bb.cc
+>>>  d.e.f in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  d.e.f in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  d.e.f in "bbb.ccc"? no (end of list)
 >>> xyz@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> xyz@d.e.f in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> xyz@d.e.f in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> abc.def in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> abc.def in "lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch"? yes (matched "lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch")
->>> yy@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch")
+>>> yy@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  abc.def in "b.c"?
+>>>   list element: b.c
+>>>  abc.def in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  abc.def in "lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>   abc.def in "lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch"? yes (matched "lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch")
+>>>  yy@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> yy@abc.def in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> yy@abc.def in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> z.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  z.z in "b.c"?
+>>>   list element: b.c
+>>>  z.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> z.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> z.z in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> z.z in "bbb.ccc"? no (end of list)
+>>> cba@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  z.z in "b.c"?
+>>>   list element: b.c
+>>>  z.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  z.z in "bb.cc"?
+>>>   list element: bb.cc
+>>>  z.z in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  z.z in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  z.z in "bbb.ccc"? no (end of list)
 >>> cba@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> cba@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> cba@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> z.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  z.z in "b.c"?
+>>>   list element: b.c
+>>>  z.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> p.q.r in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> 12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> 12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  p.q.r in "b.c"?
+>>>   list element: b.c
+>>>  p.q.r in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> z.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> 12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> 12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  z.z in "b.c"?
+>>>   list element: b.c
+>>>  z.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> p.q.r in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> p.q.r in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> p.q.r in "bbb.ccc"? no (end of list)
+>>> 1234@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  p.q.r in "b.c"?
+>>>   list element: b.c
+>>>  p.q.r in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  p.q.r in "bb.cc"?
+>>>   list element: bb.cc
+>>>  p.q.r in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  p.q.r in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  p.q.r in "bbb.ccc"? no (end of list)
 >>> 1234@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: m.n.o
->>> p.q.r in "m.n.o"? no (end of list)
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> 1234@p.q.r in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  p.q.r in "m.n.o"?
+>>>   list element: m.n.o
+>>>  p.q.r in "m.n.o"? no (end of list)
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> 1234@p.q.r in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> m.n.o in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> m.n.o in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> m.n.o in "bbb.ccc"? no (end of list)
+>>> 1234@m.n.o in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  m.n.o in "b.c"?
+>>>   list element: b.c
+>>>  m.n.o in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  m.n.o in "bb.cc"?
+>>>   list element: bb.cc
+>>>  m.n.o in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  m.n.o in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  m.n.o in "bbb.ccc"? no (end of list)
 >>> 1234@m.n.o in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: m.n.o
->>> m.n.o in "m.n.o"? yes (matched "m.n.o")
->>> 1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@m.n.o")
+>>> 1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  m.n.o in "m.n.o"?
+>>>   list element: m.n.o
+>>>   m.n.o in "m.n.o"? yes (matched "m.n.o")
+>>>  1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@m.n.o")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
->>> list element: *
->>> test.ex in "*"? yes (matched "*")
->>> postmaster@test.ex in "postmaster@*"? yes (matched "postmaster@*")
+>>> postmaster@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
+>>>  test.ex in "*"?
+>>>   list element: *
+>>>   test.ex in "*"? yes (matched "*")
+>>>  postmaster@test.ex in "postmaster@*"? yes (matched "postmaster@*")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
->>> list element: *
->>> myhost.ex in "*"? yes (matched "*")
->>> postmaster@myhost.ex in "postmaster@*"? yes (matched "postmaster@*")
+>>> postmaster@myhost.ex in "postmaster@*"?
+>>>  list element: postmaster@*
+>>>  myhost.ex in "*"?
+>>>   list element: *
+>>>   myhost.ex in "*"? yes (matched "*")
+>>>  postmaster@myhost.ex in "postmaster@*"? yes (matched "postmaster@*")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> a.b.c in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> a.b.c in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> a.b.c in "bbb.ccc"? no (end of list)
+>>> rr01@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  a.b.c in "b.c"?
+>>>   list element: b.c
+>>>  a.b.c in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  a.b.c in "bb.cc"?
+>>>   list element: bb.cc
+>>>  a.b.c in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"? no (end of list)
 >>> rr01@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
->>> list element: a.b.c
->>> a.b.c in "a.b.c"? yes (matched "a.b.c")
->>> rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@a.b.c" in TESTSUITE/aux-fixed/0067.rejrec)
+>>> rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
+>>>  a.b.c in "a.b.c"?
+>>>   list element: a.b.c
+>>>   a.b.c in "a.b.c"? yes (matched "a.b.c")
+>>>  rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@a.b.c" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> a.b.c in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> a.b.c in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> a.b.c in "bbb.ccc"? no (end of list)
+>>> qqq@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  a.b.c in "b.c"?
+>>>   list element: b.c
+>>>  a.b.c in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  a.b.c in "bb.cc"?
+>>>   list element: bb.cc
+>>>  a.b.c in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"? no (end of list)
 >>> qqq@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
->>> qqq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "!^qqq" in TESTSUITE/aux-fixed/0067.rejrec)
+>>> qqq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
+>>>  qqq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "!^qqq" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> a.b.c in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> a.b.c in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> a.b.c in "bbb.ccc"? no (end of list)
+>>> qq@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  a.b.c in "b.c"?
+>>>   list element: b.c
+>>>  a.b.c in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  a.b.c in "bb.cc"?
+>>>   list element: bb.cc
+>>>  a.b.c in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  a.b.c in "bbb.ccc"? no (end of list)
 >>> qq@a.b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
->>> qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec)
+>>> qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
+>>>  qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> z.z in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> z.z in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> z.z in "bbb.ccc"? no (end of list)
+>>> !excl@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  z.z in "b.c"?
+>>>   list element: b.c
+>>>  z.z in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  z.z in "bb.cc"?
+>>>   list element: bb.cc
+>>>  z.z in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  z.z in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  z.z in "bbb.ccc"? no (end of list)
 >>> !excl@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
->>> !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec)
+>>> !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
+>>>  !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> userx@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> userx@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> y.p.s in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> y.p.s in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> y.p.s in "bbb.ccc"? no (end of list)
+>>> sh#rp@y.p.s in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  y.p.s in "b.c"?
+>>>   list element: b.c
+>>>  y.p.s in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  y.p.s in "bb.cc"?
+>>>   list element: bb.cc
+>>>  y.p.s in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  y.p.s in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  y.p.s in "bbb.ccc"? no (end of list)
 >>> sh#rp@y.p.s in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
->>> list element: y.p.s
->>> y.p.s in "y.p.s"? yes (matched "y.p.s")
->>> sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@y.p.s" in TESTSUITE/aux-fixed/0067.rejrec)
+>>> sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
+>>>  y.p.s in "y.p.s"?
+>>>   list element: y.p.s
+>>>   y.p.s in "y.p.s"? yes (matched "y.p.s")
+>>>  sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@y.p.s" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> xx.yy in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> xx.yy in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> xx.yy in "bbb.ccc"? no (end of list)
+>>> abc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  xx.yy in "b.c"?
+>>>   list element: b.c
+>>>  xx.yy in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  xx.yy in "bb.cc"?
+>>>   list element: bb.cc
+>>>  xx.yy in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  xx.yy in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>  xx.yy in "bbb.ccc"? no (end of list)
 >>> abc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> abc@xx.yy in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> abc@xx.yy in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> xx.yy in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  xx.yy in "b.c"?
+>>>   list element: b.c
+>>>  xx.yy in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> xx.yy in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
+>>> aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  xx.yy in "b.c"?
+>>>   list element: b.c
+>>>  xx.yy in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: b.c
->>> bb.cc in "b.c"? no (end of list)
->>> list element: *@b.c
->>> list element: b.c
->>> bb.cc in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: bb.cc
->>> bb.cc in "bb.cc"? yes (matched "bb.cc")
->>> x@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "! x@bb.cc")
+>>> x@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  bb.cc in "b.c"?
+>>>   list element: b.c
+>>>  bb.cc in "b.c"? no (end of list)
+>>>  list element: *@b.c
+>>>  bb.cc in "b.c"?
+>>>   list element: b.c
+>>>  bb.cc in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  bb.cc in "bb.cc"?
+>>>   list element: bb.cc
+>>>   bb.cc in "bb.cc"? yes (matched "bb.cc")
+>>>  x@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "! x@bb.cc")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> x@bb.cc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> x@bb.cc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> bb.cc in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> bb.cc in "bb.cc"? yes (matched "bb.cc")
->>> y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc")
+>>> y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  bb.cc in "b.c"?
+>>>   list element: b.c
+>>>  bb.cc in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  bb.cc in "bb.cc"?
+>>>   list element: bb.cc
+>>>   bb.cc in "bb.cc"? yes (matched "bb.cc")
+>>>  y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex>
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: b.c
->>> bbb.ccc in "b.c"? no (end of list)
->>> list element: *@b.c
->>> list element: b.c
->>> bbb.ccc in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: bb.cc
->>> bbb.ccc in "bb.cc"? no (end of list)
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> bbb.ccc in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: bbb.ccc
->>> bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
->>> x@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "x@bbb.ccc" in TESTSUITE/aux-fixed/0067.not1)
+>>> x@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  bbb.ccc in "b.c"?
+>>>   list element: b.c
+>>>  bbb.ccc in "b.c"? no (end of list)
+>>>  list element: *@b.c
+>>>  bbb.ccc in "b.c"?
+>>>   list element: b.c
+>>>  bbb.ccc in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  bbb.ccc in "bb.cc"?
+>>>   list element: bb.cc
+>>>  bbb.ccc in "bb.cc"? no (end of list)
+>>>  list element: *@bb.cc
+>>>  bbb.ccc in "bb.cc"?
+>>>   list element: bb.cc
+>>>  bbb.ccc in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  bbb.ccc in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>   bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
+>>>  x@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "x@bbb.ccc" in TESTSUITE/aux-fixed/0067.not1)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> x@bbb.ccc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> x@bbb.ccc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> bbb.ccc in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> bbb.ccc in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
->>> y@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "y@bbb.ccc" in TESTSUITE/aux-fixed/0067.not2)
+>>> y@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  bbb.ccc in "b.c"?
+>>>   list element: b.c
+>>>  bbb.ccc in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  bbb.ccc in "bb.cc"?
+>>>   list element: bb.cc
+>>>  bbb.ccc in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  bbb.ccc in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>   bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
+>>>  y@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? no (matched "y@bbb.ccc" in TESTSUITE/aux-fixed/0067.not2)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 30)
 >>> check senders = 1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec
->>> list element: 1234@m.n.o
->>> list element: TESTSUITE/aux-fixed/0067.rejrec
+>>> y@bbb.ccc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"?
+>>>  list element: 1234@m.n.o
+>>>  list element: TESTSUITE/aux-fixed/0067.rejrec
 >>> y@bbb.ccc in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check recipients = postmaster@*
->>> list element: postmaster@*
+>>> x@test.ex in "postmaster@*"?
+>>>  list element: postmaster@*
 >>> x@test.ex in "postmaster@*"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 29)
 >>> check senders = !x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc
->>> list element: !x@b.c
->>> list element: *@b.c
->>> list element: b.c
->>> bbb.ccc in "b.c"? no (end of list)
->>> list element: !^philip@a.b.c
->>> list element: ^(phil|quil)[^@]*@
->>> list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
->>> list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
->>> list element: ! x@bb.cc
->>> list element: *@bb.cc
->>> list element: bb.cc
->>> bbb.ccc in "bb.cc"? no (end of list)
->>> list element: ! TESTSUITE/aux-fixed/0067.not1
->>> list element: !TESTSUITE/aux-fixed/0067.not2
->>> list element: bbb.ccc
->>> list element: bbb.ccc
->>> bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
->>> z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc")
+>>> z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"?
+>>>  list element: !x@b.c
+>>>  list element: *@b.c
+>>>  bbb.ccc in "b.c"?
+>>>   list element: b.c
+>>>  bbb.ccc in "b.c"? no (end of list)
+>>>  list element: !^philip@a.b.c
+>>>  list element: ^(phil|quil)[^@]*@
+>>>  list element: !yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch
+>>>  list element: @@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain
+>>>  list element: ! x@bb.cc
+>>>  list element: *@bb.cc
+>>>  bbb.ccc in "bb.cc"?
+>>>   list element: bb.cc
+>>>  bbb.ccc in "bb.cc"? no (end of list)
+>>>  list element: ! TESTSUITE/aux-fixed/0067.not1
+>>>  list element: !TESTSUITE/aux-fixed/0067.not2
+>>>  list element: bbb.ccc
+>>>  bbb.ccc in "bbb.ccc"?
+>>>   list element: bbb.ccc
+>>>   bbb.ccc in "bbb.ccc"? yes (matched "bbb.ccc")
+>>>  z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [1.2.3.4] F=<z@bbb.ccc> rejected RCPT <x@test.ex>
diff --git a/test/stderr/0068 b/test/stderr/0068
index 269b081fc..75da05f25 100644
--- a/test/stderr/0068
+++ b/test/stderr/0068
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 12)
 >>> accept: condition test succeeded in inline ACL
diff --git a/test/stderr/0069 b/test/stderr/0069
index c6bf5ac45..10bc7727b 100644
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -1,251 +1,285 @@
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
->>> host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")
+>>>  host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")
 >>> host in recipient_unqualified_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 >>> using ACL "check_recipientx"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipientx"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
->>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
+>>> host in "+include_unknown : ^ten-1\.test\.ex"?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
+>>>  host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY
 LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipientx"
->>> processing "accept" (TESTSUITE/test-config 24)
->>> check hosts = :
->>> list element: 
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipientx"
->>> processing "deny" (TESTSUITE/test-config 25)
->>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipientx"
+>>>  processing "accept" (TESTSUITE/test-config 24)
+>>>  check hosts = :
+>>>  host in ":"?
+>>>   list element: 
+>>>  host in ":"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipientx"
+>>>  processing "deny" (TESTSUITE/test-config 25)
+>>>  check hosts = +include_unknown : ^ten-1\\.test\\.ex
+>>>  host in "+include_unknown : ^ten-1\.test\.ex"?
+>>>   list element: +include_unknown
+>>>   list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
->>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
+>>>   host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> deny: condition test succeeded in ACL "check_recipientx"
->>> end of ACL "check_recipientx": DENY
+>>>   deny: condition test succeeded in ACL "check_recipientx"
+>>>   end of ACL "check_recipientx": DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipienty"
->>> processing "accept" (TESTSUITE/test-config 30)
->>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> list element: not-exist.test.ex
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipienty"
+>>>  processing "accept" (TESTSUITE/test-config 30)
+>>>  check hosts = not-exist.test.ex : V4NET.0.0.13
+>>>  host in "not-exist.test.ex : V4NET.0.0.13"?
+>>>   list element: not-exist.test.ex
 >>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
->>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
->>> accept: condition test failed in ACL "check_recipienty"
->>> processing "deny" (TESTSUITE/test-config 31)
->>>   message: "Denied"
->>> deny: condition test succeeded in ACL "check_recipienty"
->>> end of ACL "check_recipienty": DENY
+>>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
+>>>   accept: condition test failed in ACL "check_recipienty"
+>>>   processing "deny" (TESTSUITE/test-config 31)
+>>>     message: "Denied"
+>>>   deny: condition test succeeded in ACL "check_recipienty"
+>>>   end of ACL "check_recipienty": DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipientz"
->>> processing "accept" (TESTSUITE/test-config 34)
->>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
->>> list element: +ignore_unknown
->>> list element: not-exist.test.ex
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipientz"
+>>>  processing "accept" (TESTSUITE/test-config 34)
+>>>  check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
+>>>  host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"?
+>>>   list element: +ignore_unknown
+>>>   list element: not-exist.test.ex
 >>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
->>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
->>> list element: V4NET.0.0.13
->>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>> accept: condition test succeeded in ACL "check_recipientz"
->>> end of ACL "check_recipientz": ACCEPT
+>>>   failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
+>>>   list element: V4NET.0.0.13
+>>>   host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
+>>>  accept: condition test succeeded in ACL "check_recipientz"
+>>>  end of ACL "check_recipientz": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipienty"
->>> processing "accept" (TESTSUITE/test-config 30)
->>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> list element: not-exist.test.ex
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipienty"
+>>>  processing "accept" (TESTSUITE/test-config 30)
+>>>  check hosts = not-exist.test.ex : V4NET.0.0.13
+>>>  host in "not-exist.test.ex : V4NET.0.0.13"?
+>>>   list element: not-exist.test.ex
 >>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
->>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
+>>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
->>> accept: condition test failed in ACL "check_recipienty"
->>> processing "deny" (TESTSUITE/test-config 31)
->>>   message: "Denied"
->>> deny: condition test succeeded in ACL "check_recipienty"
->>> end of ACL "check_recipienty": DENY
+>>>   accept: condition test failed in ACL "check_recipienty"
+>>>   processing "deny" (TESTSUITE/test-config 31)
+>>>     message: "Denied"
+>>>   deny: condition test succeeded in ACL "check_recipienty"
+>>>   end of ACL "check_recipienty": DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipienta"
->>> processing "accept" (TESTSUITE/test-config 38)
->>> check hosts = :
->>> list element: 
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipienta"
->>> processing "deny" (TESTSUITE/test-config 39)
->>> check hosts = +include_defer : test.again.dns
->>> list element: +include_defer
->>> list element: test.again.dns
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipienta"
+>>>  processing "accept" (TESTSUITE/test-config 38)
+>>>  check hosts = :
+>>>  host in ":"?
+>>>   list element: 
+>>>  host in ":"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipienta"
+>>>  processing "deny" (TESTSUITE/test-config 39)
+>>>  check hosts = +include_defer : test.again.dns
+>>>  host in "+include_defer : test.again.dns"?
+>>>   list element: +include_defer
+>>>   list element: test.again.dns
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
->>> deny: condition test succeeded in ACL "check_recipienta"
->>> end of ACL "check_recipienta": DENY
+>>>   deny: condition test succeeded in ACL "check_recipienta"
+>>>   end of ACL "check_recipienta": DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipientb"
->>> processing "accept" (TESTSUITE/test-config 44)
->>> check hosts = test.again.dns : V4NET.0.0.13
->>> list element: test.again.dns
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipientb"
+>>>  processing "accept" (TESTSUITE/test-config 44)
+>>>  check hosts = test.again.dns : V4NET.0.0.13
+>>>  host in "test.again.dns : V4NET.0.0.13"?
+>>>   list element: test.again.dns
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
->>> accept: condition test deferred in ACL "check_recipientb"
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
+>>>  accept: condition test deferred in ACL "check_recipientb"
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: +include_unknown
->>> list element: ^ten-1\.test\.ex
+>>> host in sender_unqualified_hosts?
+>>>  list element: +include_unknown
+>>>  list element: ^ten-1\.test\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.13
 LOG: no host name found for IP address V4NET.0.0.13
->>> host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
+>>>  host in sender_unqualified_hosts? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> test in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipientc"
->>> processing "accept" (TESTSUITE/test-config 48)
->>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
->>> list element: +ignore_defer
->>> list element: test.again.dns
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts? no (option unset)
+>>>  host in pipelining_connect_advertise_hosts?
+>>>   list element: 
+>>>  test in helo_lookup_domains?
+>>>   list element: @
+>>>   list element: @[]
+>>>  test in helo_lookup_domains? no (end of list)
+>>>  using ACL "check_recipientc"
+>>>  processing "accept" (TESTSUITE/test-config 48)
+>>>  check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
+>>>  host in "+ignore_defer : test.again.dns : V4NET.0.0.13"?
+>>>   list element: +ignore_defer
+>>>   list element: test.again.dns
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
->>> list element: V4NET.0.0.13
->>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>> accept: condition test succeeded in ACL "check_recipientc"
->>> end of ACL "check_recipientc": ACCEPT
+>>>   test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>   DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
+>>>   list element: V4NET.0.0.13
+>>>   host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
+>>>  accept: condition test succeeded in ACL "check_recipientc"
+>>>  end of ACL "check_recipientc": ACCEPT
diff --git a/test/stderr/0070 b/test/stderr/0070
index 64eb8c90b..f40155a67 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -3,35 +3,41 @@
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> host in helo_verify_hosts? yes (matched "ten-1.test.ex")
+>>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 LOG: rejected MAIL from [V4NET.0.0.1]: no HELO/EHLO given
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require" (TESTSUITE/test-config 23)
@@ -47,24 +53,28 @@ LOG: H=[V4NET.0.0.13] F=<userx@cus.cam.ac.uk> rejected RCPT <a@b>: helo not veri
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
->>> host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
+>>>  host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [V4NET.0.0.1] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.0.0.1] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> HELO verification failed but host is in helo_try_verify_hosts
@@ -80,24 +90,28 @@ LOG: H=([V4NET.0.0.1]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo not verif
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
->>> host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
+>>>  host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [V4NET.0.0.2] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.0.0.2] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
 >>> matched host address
@@ -116,15 +130,18 @@ LOG: H=([V4NET.0.0.2]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo did verif
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> host in helo_verify_hosts? yes (matched "ten-1.test.ex")
+>>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> ten-1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> ten-1.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-1.test.ex"
 >>> looking up host name for V4NET.0.0.1
@@ -137,19 +154,22 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
->>> host in helo_verify_hosts? yes (matched "ten-3.test.ex")
+>>>  host in helo_verify_hosts? yes (matched "ten-3.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> ten-3.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> ten-3.test.ex in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "ten-3.test.ex"
 >>> looking up host name for V4NET.0.0.3
@@ -160,15 +180,18 @@ MUNGED: ::1 will be omitted in what follows
 >>> checking addresses for ten-3-alias.test.ex
 >>>   V4NET.0.0.3 OK
 >>> matched host name
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> verifying EHLO/HELO argument "ten-3-alias.test.ex"
 >>> matched alias ten-3-alias.test.ex
 >>> verifying EHLO/HELO argument "ten-3xtra.test.ex"
 >>> getting IP address for ten-3xtra.test.ex
+>>> ten-3xtra.test.ex in ""?
 >>> ten-3xtra.test.ex in ""? no (end of list)
->>> list element: *
->>> ten-3xtra.test.ex in "*"? yes (matched "*")
+>>> ten-3xtra.test.ex in "*"?
+>>>  list element: *
+>>>  ten-3xtra.test.ex in "*"? yes (matched "*")
 >>> IP address for ten-3xtra.test.ex matches calling address
 >>> Forward DNS security status: unverified
 >>> host in hosts_connection_nolog? no (option unset)
@@ -176,15 +199,18 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> host in helo_verify_hosts? yes (matched "ten-1.test.ex")
+>>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhubarb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for V4NET.0.0.1
@@ -192,61 +218,72 @@ MUNGED: ::1 will be omitted in what follows
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> getting IP address for rhubarb
+>>> rhubarb in ""?
 >>> rhubarb in ""? no (end of list)
->>> list element: *
->>> rhubarb in "*"? yes (matched "*")
+>>> rhubarb in "*"?
+>>>  list element: *
+>>>  rhubarb in "*"? yes (matched "*")
 LOG: rejected "EHLO rhubarb" from (rhubarb) [V4NET.0.0.1]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
->>> list element: 99.99.99.99
->>> host in helo_verify_hosts? yes (matched "99.99.99.99")
+>>>  list element: 99.99.99.99
+>>>  host in helo_verify_hosts? yes (matched "99.99.99.99")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhubarb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for 99.99.99.99
 >>> Test harness: host name lookup returns DEFER
 >>> getting IP address for rhubarb
+>>> rhubarb in ""?
 >>> rhubarb in ""? no (end of list)
->>> list element: *
->>> rhubarb in "*"? yes (matched "*")
+>>> rhubarb in "*"?
+>>>  list element: *
+>>>  rhubarb in "*"? yes (matched "*")
 LOG: temporarily rejected "EHLO rhubarb" from (rhubarb) [99.99.99.99]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [V4NET.0.0.99] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require" (TESTSUITE/test-config 23)
@@ -261,24 +298,28 @@ LOG: H=([V4NET.0.0.99]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo not ver
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [V4NET.0.0.13] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "require" (TESTSUITE/test-config 23)
@@ -297,29 +338,38 @@ LOG: H=([V4NET.0.0.13]) [V4NET.0.0.13] F=<a@b> rejected RCPT <c@d>: helo did ver
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: ten-1.test.ex
+>>> host in helo_verify_hosts?
+>>>  list element: ten-1.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
->>> list element: ten-3.test.ex
+>>>  list element: ten-3.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>> host in helo_verify_hosts? no (end of list)
->>> list element: ten-2.test.ex
+>>> host in helo_try_verify_hosts?
+>>>  list element: ten-2.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhubarb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhubarb in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "rcpt"
 >>> processing "require" (TESTSUITE/test-config 23)
 >>>   message: helo not verified
@@ -328,9 +378,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> looking up host name for 99.99.99.99
 >>> Test harness: host name lookup returns DEFER
 >>> getting IP address for rhubarb
+>>> rhubarb in ""?
 >>> rhubarb in ""? no (end of list)
->>> list element: *
->>> rhubarb in "*"? yes (matched "*")
+>>> rhubarb in "*"?
+>>>  list element: *
+>>>  rhubarb in "*"? yes (matched "*")
 >>> require: condition test failed in ACL "rcpt"
 >>> end of ACL "rcpt": not OK
 LOG: H=(rhubarb) [99.99.99.99] F=<a@b> rejected RCPT <c@d>: helo not verified
diff --git a/test/stderr/0077 b/test/stderr/0077
index 4d196d3b8..78811045c 100644
--- a/test/stderr/0077
+++ b/test/stderr/0077
@@ -6,29 +6,34 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
->>> list element: ! @
+>>> host in "! @ : ! localhost"?
+>>>  list element: ! @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> list element: ! localhost
+>>>  list element: ! localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
->>> host in "! @ : ! localhost"? no (matched "! localhost")
+>>>  host in "! @ : ! localhost"? no (matched "! localhost")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -39,25 +44,30 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
->>> list element: ! @
+>>> host in "! @ : ! localhost"?
+>>>  list element: ! @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> host in "! @ : ! localhost"? no (matched "! @")
+>>>  host in "! @ : ! localhost"? no (matched "! @")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -68,18 +78,21 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
->>> list element: ! @
+>>> host in "! @ : ! localhost"?
+>>>  list element: ! @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> list element: ! localhost
+>>>  list element: ! localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
diff --git a/test/stderr/0079 b/test/stderr/0079
index dc1eab1c9..51f04b985 100644
--- a/test/stderr/0079
+++ b/test/stderr/0079
@@ -6,18 +6,26 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> exim.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn" (TESTSUITE/test-config 25)
@@ -35,10 +43,12 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: V4NET.11.12.14 is in rbl.test.ex
 >>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
 >>> l_message: accepting postmaster from host in $dnslist_domain
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
+>>> postmaster@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
 >>> check dnslists = rbl2.test.ex
 >>> dnslists check: rbl2.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl2.test.ex
@@ -49,16 +59,19 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: V4NET.11.12.14 is in rbl.test.ex
 LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host in rbl2.test.ex
 >>> processing "accept" (TESTSUITE/test-config 32)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
+>>> postmaster@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "warn" (TESTSUITE/test-config 25)
@@ -74,12 +87,14 @@ LOG: H=(exim.test.ex) [V4NET.11.12.14] Warning: accepting postmaster from host i
 >>>   message: X-Warning: $sender_host_address is blacklisted at $dnslist_domain
 >>> l_message: accepting postmaster from host in $dnslist_domain
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> list@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 32)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> list@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 33)
diff --git a/test/stderr/0080 b/test/stderr/0080
index 811416462..e8858b5cf 100644
--- a/test/stderr/0080
+++ b/test/stderr/0080
@@ -6,27 +6,37 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> exim.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
+>>> postmaster@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> list@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
diff --git a/test/stderr/0085 b/test/stderr/0085
index 5bf61883d..520e9de95 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -35,18 +19,21 @@ routing x@y.z
 --------> smart1 router <--------
 local_part=x domain=y.z
 checking domains
-list element: smart.domain
+y.z in "smart.domain"?
+ list element: smart.domain
 y.z in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=y.z
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  list element: myhost.test.ex
-  y.z in "test.ex : myhost.test.ex"? no (end of list)
- end sublist local_domains
+y.z in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   y.z in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎list element: myhost.test.ex
+   y.z in "test.ex : myhost.test.ex"? no (end of list)
+  end sublist local_domains
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
@@ -64,8 +51,9 @@ routing x@smart.domain
 --------> smart1 router <--------
 local_part=x domain=smart.domain
 checking domains
-list element: smart.domain
-smart.domain in "smart.domain"? yes (matched "smart.domain")
+smart.domain in "smart.domain"?
+ list element: smart.domain
+ smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
@@ -79,8 +67,9 @@ checking local_parts
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
  lookup yielded: x : y : abc@d.e.f
-list element: x
-x in "x : y : abc@d.e.f"? yes (matched "x")
+x in "x : y : abc@d.e.f"?
+ list element: x
+ x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -94,25 +83,30 @@ checking senders
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
-list element: x
-address match test: subject=abc@d.e.f pattern=x
-list element: x
-d.e.f in "x"? no (end of list)
-list element: y
-address match test: subject=abc@d.e.f pattern=y
-list element: y
-d.e.f in "y"? no (end of list)
-list element: abc@d.e.f
-address match test: subject=abc@d.e.f pattern=abc@d.e.f
-list element: d.e.f
-d.e.f in "d.e.f"? yes (matched "d.e.f")
-abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
+abc@d.e.f in "x : y : abc@d.e.f"?
+ list element: x
+ address match test: subject=abc@d.e.f pattern=x
+ d.e.f in "x"?
+  list element: x
+ d.e.f in "x"? no (end of list)
+ list element: y
+ address match test: subject=abc@d.e.f pattern=y
+ d.e.f in "y"?
+  list element: y
+ d.e.f in "y"? no (end of list)
+ list element: abc@d.e.f
+ address match test: subject=abc@d.e.f pattern=abc@d.e.f
+ d.e.f in "d.e.f"?
+  list element: d.e.f
+  d.e.f in "d.e.f"? yes (matched "d.e.f")
+ abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 calling smart1 router
 smart1 router called for x@smart.domain
   domain = smart.domain
 route_item = *
-list element: *
-smart.domain in "*"? yes (matched "*")
+smart.domain in "*"?
+ list element: *
+ smart.domain in "*"? yes (matched "*")
 original list of hosts = '' options = ''
 expanded list of hosts = '' options = ''
 queued for <unset> transport: local_part = x
@@ -131,25 +125,29 @@ routing x@test.ex
 --------> smart1 router <--------
 local_part=x domain=test.ex
 checking domains
-list element: smart.domain
+test.ex in "smart.domain"?
+ list element: smart.domain
 test.ex in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "! +local_domains"? no (matched "! +local_domains")
+test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   test.ex in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=test.ex
 checking domains
-list element: test.ex
-test.ex in "test.ex"? yes (matched "test.ex")
+test.ex in "test.ex"?
+ list element: test.ex
+ test.ex in "test.ex"? yes (matched "test.ex")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -164,8 +162,9 @@ checking local_parts
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
  lookup yielded: x : y : abc@d.e.f
-list element: x
-x in "x : y : abc@d.e.f"? yes (matched "x")
+x in "x : y : abc@d.e.f"?
+ list element: x
+ x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -179,19 +178,23 @@ checking senders
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
-list element: x
-address match test: subject=abc@d.e.f pattern=x
-list element: x
-d.e.f in "x"? no (end of list)
-list element: y
-address match test: subject=abc@d.e.f pattern=y
-list element: y
-d.e.f in "y"? no (end of list)
-list element: abc@d.e.f
-address match test: subject=abc@d.e.f pattern=abc@d.e.f
-list element: d.e.f
-d.e.f in "d.e.f"? yes (matched "d.e.f")
-abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
+abc@d.e.f in "x : y : abc@d.e.f"?
+ list element: x
+ address match test: subject=abc@d.e.f pattern=x
+ d.e.f in "x"?
+  list element: x
+ d.e.f in "x"? no (end of list)
+ list element: y
+ address match test: subject=abc@d.e.f pattern=y
+ d.e.f in "y"?
+  list element: y
+ d.e.f in "y"? no (end of list)
+ list element: abc@d.e.f
+ address match test: subject=abc@d.e.f pattern=abc@d.e.f
+ d.e.f in "d.e.f"?
+  list element: d.e.f
+  d.e.f in "d.e.f"? yes (matched "d.e.f")
+ abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 checking require_files
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -229,25 +232,29 @@ routing x@myhost.test.ex
 --------> smart1 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: smart.domain
+myhost.test.ex in "smart.domain"?
+ list element: smart.domain
 myhost.test.ex in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  list element: myhost.test.ex
-  myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
-myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
+myhost.test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   myhost.test.ex in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎list element: myhost.test.ex
+   ╎myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
+ myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: test.ex
+myhost.test.ex in "test.ex"?
+ list element: test.ex
 myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
@@ -256,22 +263,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -290,18 +281,21 @@ routing x@y.z
 --------> smart1 router <--------
 local_part=x domain=y.z
 checking domains
-list element: smart.domain
+y.z in "smart.domain"?
+ list element: smart.domain
 y.z in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=y.z
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  list element: myhost.test.ex
-  y.z in "test.ex : myhost.test.ex"? no (end of list)
- end sublist local_domains
+y.z in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   y.z in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎list element: myhost.test.ex
+   y.z in "test.ex : myhost.test.ex"? no (end of list)
+  end sublist local_domains
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
@@ -319,8 +313,9 @@ routing x@smart.domain
 --------> smart1 router <--------
 local_part=x domain=smart.domain
 checking domains
-list element: smart.domain
-smart.domain in "smart.domain"? yes (matched "smart.domain")
+smart.domain in "smart.domain"?
+ list element: smart.domain
+ smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
@@ -334,8 +329,9 @@ checking local_parts
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
  lookup yielded: x : y : abc@d.e.f
-list element: x
-x in "x : y : abc@d.e.f"? yes (matched "x")
+x in "x : y : abc@d.e.f"?
+ list element: x
+ x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -349,27 +345,32 @@ checking senders
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
-list element: x
-address match test: subject=CALLER@myhost.test.ex pattern=x
-list element: x
-myhost.test.ex in "x"? no (end of list)
-list element: y
-address match test: subject=CALLER@myhost.test.ex pattern=y
-list element: y
-myhost.test.ex in "y"? no (end of list)
-list element: abc@d.e.f
-address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
+ list element: x
+ address match test: subject=CALLER@myhost.test.ex pattern=x
+ myhost.test.ex in "x"?
+  list element: x
+ myhost.test.ex in "x"? no (end of list)
+ list element: y
+ address match test: subject=CALLER@myhost.test.ex pattern=y
+ myhost.test.ex in "y"?
+  list element: y
+ myhost.test.ex in "y"? no (end of list)
+ list element: abc@d.e.f
+ address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart1 router skipped: senders mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=smart.domain
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  list element: myhost.test.ex
-  smart.domain in "test.ex : myhost.test.ex"? no (end of list)
- end sublist local_domains
+smart.domain in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   smart.domain in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎list element: myhost.test.ex
+   smart.domain in "test.ex : myhost.test.ex"? no (end of list)
+  end sublist local_domains
 smart.domain in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
@@ -387,25 +388,29 @@ routing x@test.ex
 --------> smart1 router <--------
 local_part=x domain=test.ex
 checking domains
-list element: smart.domain
+test.ex in "smart.domain"?
+ list element: smart.domain
 test.ex in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "! +local_domains"? no (matched "! +local_domains")
+test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   test.ex in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=test.ex
 checking domains
-list element: test.ex
-test.ex in "test.ex"? yes (matched "test.ex")
+test.ex in "test.ex"?
+ list element: test.ex
+ test.ex in "test.ex"? yes (matched "test.ex")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -420,8 +425,9 @@ checking local_parts
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
  lookup yielded: x : y : abc@d.e.f
-list element: x
-x in "x : y : abc@d.e.f"? yes (matched "x")
+x in "x : y : abc@d.e.f"?
+ list element: x
+ x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -435,16 +441,19 @@ checking senders
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
  lookup yielded: x : y : abc@d.e.f
-list element: x
-address match test: subject=CALLER@myhost.test.ex pattern=x
-list element: x
-myhost.test.ex in "x"? no (end of list)
-list element: y
-address match test: subject=CALLER@myhost.test.ex pattern=y
-list element: y
-myhost.test.ex in "y"? no (end of list)
-list element: abc@d.e.f
-address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
+ list element: x
+ address match test: subject=CALLER@myhost.test.ex pattern=x
+ myhost.test.ex in "x"?
+  list element: x
+ myhost.test.ex in "x"? no (end of list)
+ list element: y
+ address match test: subject=CALLER@myhost.test.ex pattern=y
+ myhost.test.ex in "y"?
+  list element: y
+ myhost.test.ex in "y"? no (end of list)
+ list element: abc@d.e.f
+ address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart2 router skipped: senders mismatch
 no more routers
@@ -457,25 +466,29 @@ routing x@myhost.test.ex
 --------> smart1 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: smart.domain
+myhost.test.ex in "smart.domain"?
+ list element: smart.domain
 myhost.test.ex in "smart.domain"? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  list element: myhost.test.ex
-  myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
-myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
+myhost.test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   myhost.test.ex in "test.ex : myhost.test.ex"?
+   ╎list element: test.ex
+   ╎list element: myhost.test.ex
+   ╎myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
+ myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-list element: test.ex
+myhost.test.ex in "test.ex"?
+ list element: test.ex
 myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
diff --git a/test/stderr/0086 b/test/stderr/0086
index 1b25a8c05..e5d56e319 100644
--- a/test/stderr/0086
+++ b/test/stderr/0086
@@ -2,14 +2,17 @@
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
@@ -28,14 +31,17 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
@@ -54,14 +60,17 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
@@ -80,14 +89,17 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
@@ -106,14 +118,17 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
@@ -132,14 +147,17 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
->>> host in recipient_unqualified_hosts? yes (matched "V4NET.10.10.9")
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
+>>>  host in recipient_unqualified_hosts? yes (matched "V4NET.10.10.9")
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
diff --git a/test/stderr/0087 b/test/stderr/0087
index 3086d1278..4e11a909d 100644
--- a/test/stderr/0087
+++ b/test/stderr/0087
@@ -6,34 +6,41 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: defer
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -55,34 +62,41 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: defer
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -104,34 +118,41 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: defer
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -141,9 +162,11 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> verifying From: header address badbad@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing badbad@test.ex
->>> list element: defer
+>>> badbad in "defer"?
+>>>  list element: defer
 >>> badbad in "defer"? no (end of list)
->>> list element: userx
+>>> badbad in "userx"?
+>>>  list element: userx
 >>> badbad in "userx"? no (end of list)
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
@@ -157,34 +180,41 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: defer
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -194,9 +224,11 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after
 >>> verifying From: header address badbad@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing badbad@test.ex
->>> list element: defer
+>>> badbad in "defer"?
+>>>  list element: defer
 >>> badbad in "defer"? no (end of list)
->>> list element: userx
+>>> badbad in "userx"?
+>>>  list element: userx
 >>> badbad in "userx"? no (end of list)
 >>> no more routers
 >>> verifying From: header address userx@test.ex
@@ -214,34 +246,41 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: defer
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -251,8 +290,9 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> verifying From: header address defer@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing defer@test.ex
->>> list element: defer
->>> defer in "defer"? yes (matched "defer")
+>>> defer in "defer"?
+>>>  list element: defer
+>>>  defer in "defer"? yes (matched "defer")
 >>> calling defer router
 >>> defer router: defer for defer@test.ex
 >>>   message: this is a forced defer
diff --git a/test/stderr/0089 b/test/stderr/0089
index 7b6b4b844..f9289090f 100644
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -1,124 +1,150 @@
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: *N-99.test.EX
+>>> host in sender_unqualified_hosts?
+>>>  list element: *N-99.test.EX
 >>> sender host name required, to match against *N-99.test.EX
 >>> looking up host name for V4NET.0.0.0
 LOG: no host name found for IP address V4NET.0.0.0
->>> host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
->>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? no (option unset)
->>> host in helo_try_verify_hosts? no (option unset)
->>> list element: *N-99.test.ex
+>>>  host in sender_unqualified_hosts? no (failed to find host name for V4NET.0.0.0)
+>>>  host in recipient_unqualified_hosts? no (option unset)
+>>>  host in helo_verify_hosts? no (option unset)
+>>>  host in helo_try_verify_hosts? no (option unset)
+>>>  host in helo_accept_junk_hosts?
+>>>   list element: *N-99.test.ex
 >>> sender host name required, to match against *N-99.test.ex
->>> host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
->>> list element: 
+>>>   host in helo_accept_junk_hosts? no (failed to find host name for V4NET.0.0.0)
+>>>   host in pipelining_connect_advertise_hosts?
+>>>    list element: 
 LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&*()
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> list element: @
->>> list element: @[]
->>> abc_xyz in helo_lookup_domains? no (end of list)
->>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
->>> check hosts = :
->>> list element: 
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
->>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: Test.ex
->>> test.ex in "Test.ex : myhost.test.EX"? yes (matched "Test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
->>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
->>> check hosts = :
->>> list element: 
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
->>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: Test.ex
->>> list element: myhost.test.EX
->>> else.where in "Test.ex : myhost.test.EX"? no (end of list)
->>> else.where in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 26)
->>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: Test.ex
->>> list element: Relay.one.ex
->>> else.where in "Test.ex : Relay.one.ex"? no (end of list)
->>> else.where in "+relay_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 27)
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>>   host in smtp_accept_max_nonmail_hosts?
+>>>    list element: *
+>>>    host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>>   abc_xyz in helo_lookup_domains?
+>>>    list element: @
+>>>    list element: @[]
+>>>   abc_xyz in helo_lookup_domains? no (end of list)
+>>>   using ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   check hosts = :
+>>>   host in ":"?
+>>>    list element: 
+>>>   host in ":"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 25)
+>>>   check domains = +local_domains
+>>>   test.ex in "+local_domains"?
+>>>    list element: +local_domains
+>>>    test.ex in "Test.ex : myhost.test.EX"?
+>>>    ╎list element: Test.ex
+>>>    ╎test.ex in "Test.ex : myhost.test.EX"? yes (matched "Test.ex")
+>>>    test.ex in "+local_domains"? yes (matched "+local_domains")
+>>>   accept: condition test succeeded in ACL "check_recipient"
+>>>   end of ACL "check_recipient": ACCEPT
+>>>   using ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   check hosts = :
+>>>   host in ":"?
+>>>    list element: 
+>>>   host in ":"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 25)
+>>>   check domains = +local_domains
+>>>   else.where in "+local_domains"?
+>>>    list element: +local_domains
+>>>    else.where in "Test.ex : myhost.test.EX"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: myhost.test.EX
+>>>    else.where in "Test.ex : myhost.test.EX"? no (end of list)
+>>>   else.where in "+local_domains"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "accept" (TESTSUITE/test-config 26)
+>>>   check domains = +relay_domains
+>>>   else.where in "+relay_domains"?
+>>>    list element: +relay_domains
+>>>    else.where in "Test.ex : Relay.one.ex"?
+>>>    ╎list element: Test.ex
+>>>    ╎list element: Relay.one.ex
+>>>    else.where in "Test.ex : Relay.one.ex"? no (end of list)
+>>>   else.where in "+relay_domains"? no (end of list)
+>>>   accept: condition test failed in ACL "check_recipient"
+>>>   processing "deny" (TESTSUITE/test-config 27)
+>>>     message: relay not permitted
+>>>   deny: condition test succeeded in ACL "check_recipient"
+>>>   end of ACL "check_recipient": DENY
 LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else.where>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
->>> list element: *N-99.test.EX
+>>> host in sender_unqualified_hosts?
+>>>  list element: *N-99.test.EX
 >>> sender host name required, to match against *N-99.test.EX
 >>> looking up host name for V4NET.0.0.99
 >>> IP address lookup yielded "ten-99.test.ex"
 >>> checking addresses for ten-99.test.ex
 >>>   V4NET.0.0.99 OK
->>> host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
+>>>  host in sender_unqualified_hosts? yes (matched "*N-99.test.EX")
 >>> host in recipient_unqualified_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
->>> list element: *N-99.test.ex
->>> host in helo_accept_junk_hosts? yes (matched "*N-99.test.ex")
->>> list element: 
+>>> host in helo_accept_junk_hosts?
+>>>  list element: *N-99.test.ex
+>>>  host in helo_accept_junk_hosts? yes (matched "*N-99.test.ex")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: Test.ex
->>> list element: myhost.test.EX
->>> relay.one.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>> relay.one.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  relay.one.ex in "Test.ex : myhost.test.EX"?
+>>>   list element: Test.ex
+>>>   list element: myhost.test.EX
+>>>  relay.one.ex in "Test.ex : myhost.test.EX"? no (end of list)
 >>> relay.one.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: Test.ex
->>> list element: Relay.one.ex
->>> relay.one.ex in "Test.ex : Relay.one.ex"? yes (matched "Relay.one.ex")
->>> relay.one.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>> relay.one.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  relay.one.ex in "Test.ex : Relay.one.ex"?
+>>>   list element: Test.ex
+>>>   list element: Relay.one.ex
+>>>   relay.one.ex in "Test.ex : Relay.one.ex"? yes (matched "Relay.one.ex")
+>>>  relay.one.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: Test.ex
->>> list element: myhost.test.EX
->>> relay.two.ex in "Test.ex : myhost.test.EX"? no (end of list)
+>>> relay.two.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  relay.two.ex in "Test.ex : myhost.test.EX"?
+>>>   list element: Test.ex
+>>>   list element: myhost.test.EX
+>>>  relay.two.ex in "Test.ex : myhost.test.EX"? no (end of list)
 >>> relay.two.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: Test.ex
->>> list element: Relay.one.ex
->>> relay.two.ex in "Test.ex : Relay.one.ex"? no (end of list)
+>>> relay.two.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  relay.two.ex in "Test.ex : Relay.one.ex"?
+>>>   list element: Test.ex
+>>>   list element: Relay.one.ex
+>>>  relay.two.ex in "Test.ex : Relay.one.ex"? no (end of list)
 >>> relay.two.ex in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 27)
diff --git a/test/stderr/0091 b/test/stderr/0091
index f69e43565..18164df91 100644
--- a/test/stderr/0091
+++ b/test/stderr/0091
@@ -6,22 +6,27 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
->>> list element: ! V4NET.0.0.1
->>> host in "! V4NET.0.0.1"? no (matched "! V4NET.0.0.1")
+>>> host in "! V4NET.0.0.1"?
+>>>  list element: ! V4NET.0.0.1
+>>>  host in "! V4NET.0.0.1"? no (matched "! V4NET.0.0.1")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -31,7 +36,8 @@
 >>> verifying From: header address <junk@jink.jonk.test.ex>
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junk@jink.jonk.test.ex
->>> list element: userx
+>>> junk in "userx"?
+>>>  list element: userx
 >>> junk in "userx"? no (end of list)
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
@@ -45,19 +51,23 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
->>> list element: ! V4NET.0.0.1
+>>> host in "! V4NET.0.0.1"?
+>>>  list element: ! V4NET.0.0.1
 >>> host in "! V4NET.0.0.1"? yes (end of list)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junk@jink.jonk.test.ex
->>> list element: userx
+>>> junk in "userx"?
+>>>  list element: userx
 >>> junk in "userx"? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
@@ -73,30 +83,36 @@ LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
->>> list element: ! V4NET.0.0.1
+>>> host in "! V4NET.0.0.1"?
+>>>  list element: ! V4NET.0.0.1
 >>> host in "! V4NET.0.0.1"? yes (end of list)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -106,7 +122,8 @@ LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.
 >>> verifying From: header address <junk@jink.jonk.test.ex>
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junk@jink.jonk.test.ex
->>> list element: userx
+>>> junk in "userx"?
+>>>  list element: userx
 >>> junk in "userx"? no (end of list)
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
@@ -120,30 +137,36 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DA
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
->>> list element: ! V4NET.0.0.1
+>>> host in "! V4NET.0.0.1"?
+>>>  list element: ! V4NET.0.0.1
 >>> host in "! V4NET.0.0.1"? yes (end of list)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -153,8 +176,9 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DA
 >>> verifying From: header address <userx@test.ex>
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> require: condition test succeeded in ACL "check_message"
diff --git a/test/stderr/0092 b/test/stderr/0092
index 2679d9778..491a30ee4 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -6,7 +6,8 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -16,50 +17,42 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
->>> list element: verify@test.ex
+>>> userx@test.ex in "verify@test.ex"?
+>>>  list element: verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -117,12 +110,14 @@ host in helo_accept_junk_hosts? no (option unset)
  ├considering: $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.1]
 sender_rcvhost = [V4NET.0.0.1] (helo=test)
@@ -136,25 +131,29 @@ SMTP<< rcpt to:userx@test.ex
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 27)
 check hosts = :
-list element: 
+host in ":"?
+ list element: 
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny" (TESTSUITE/test-config 28)
   message: unrouteable address
 check recipients = verify@test.ex
-list element: verify@test.ex
-address match test: subject=userx@test.ex pattern=verify@test.ex
+userx@test.ex in "verify@test.ex"?
+ list element: verify@test.ex
+ address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
 deny: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
-list element: +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "+local_domains"? yes (matched "+local_domains")
+test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   test.ex in "test.ex : *.test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
@@ -176,30 +175,37 @@ exim: timed out while reading - message abandoned
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
->>> list element: verify@test.ex
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")
+>>> verify@test.ex in "verify@test.ex"?
+>>>  list element: verify@test.ex
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  verify@test.ex in "verify@test.ex"? yes (matched "verify@test.ex")
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing verify@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> calling forward router
 >>> forward router declined for verify@test.ex
 >>> no more routers
diff --git a/test/stderr/0094 b/test/stderr/0094
index 94ded4b75..e1d7ffc71 100644
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -1,6 +1,7 @@
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: 0.0.0.0/0
->>> host in host_lookup? yes (matched "0.0.0.0/0")
+>>> host in host_lookup?
+>>>  list element: 0.0.0.0/0
+>>>  host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.11.12.13
 LOG: no host name found for IP address V4NET.11.12.13
 >>> host in host_reject_connection? no (option unset)
@@ -9,39 +10,47 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> cam.ac.uk in "test.ex"? no (end of list)
+>>> cam.ac.uk in "+local_domains"?
+>>>  list element: +local_domains
+>>>  cam.ac.uk in "test.ex"?
+>>>   list element: test.ex
+>>>  cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> list element: *.masq.test.ex
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "*.masq.test.ex"?
+>>>   list element: *.masq.test.ex
 >>> sender host name required, to match against *.masq.test.ex
->>> host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 26)
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>>   host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
+>>>  host in "+relay_hosts"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "deny" (TESTSUITE/test-config 26)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: 0.0.0.0/0
->>> host in host_lookup? yes (matched "0.0.0.0/0")
+>>> host in host_lookup?
+>>>  list element: 0.0.0.0/0
+>>>  host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
@@ -52,25 +61,31 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> cam.ac.uk in "test.ex"? no (end of list)
+>>> cam.ac.uk in "+local_domains"?
+>>>  list element: +local_domains
+>>>  cam.ac.uk in "test.ex"?
+>>>   list element: test.ex
+>>>  cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> list element: *.masq.test.ex
->>> host in "*.masq.test.ex"? no (end of list)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "*.masq.test.ex"?
+>>>   list element: *.masq.test.ex
+>>>  host in "*.masq.test.ex"? no (end of list)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)
@@ -81,22 +96,6 @@ LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <use
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -110,8 +109,9 @@ sender_rcvhost = [V4NET.99.99.90]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.99.99.90]
-list element: 0.0.0.0/0
-host in host_lookup? yes (matched "0.0.0.0/0")
+host in host_lookup?
+ list element: 0.0.0.0/0
+  host in host_lookup? yes (matched "0.0.0.0/0")
 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
@@ -139,7 +139,8 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
@@ -155,18 +156,21 @@ SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :
-list element: 
+host in ":"?
+ list element: 
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
-list element: +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "+local_domains"? yes (matched "+local_domains")
+test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "+local_domains"? yes (matched "+local_domains")
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted
@@ -174,25 +178,30 @@ SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :
-list element: 
+host in ":"?
+ list element: 
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
-list element: +local_domains
- start sublist local_domains
-  list element: test.ex
-  cam.ac.uk in "test.ex"? no (end of list)
- end sublist local_domains
+cam.ac.uk in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   cam.ac.uk in "test.ex"?
+   ╎list element: test.ex
+   cam.ac.uk in "test.ex"? no (end of list)
+  end sublist local_domains
 cam.ac.uk in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 25)
 check hosts = +relay_hosts
-list element: +relay_hosts
- start sublist relay_hosts
-  list element: *.masq.test.ex
+host in "+relay_hosts"?
+ list element: +relay_hosts
+  start sublist relay_hosts
+  host in "*.masq.test.ex"?
+   ╎list element: *.masq.test.ex
   host in "*.masq.test.ex"? no (end of list)
- end sublist relay_hosts
+  end sublist relay_hosts
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny" (TESTSUITE/test-config 26)
diff --git a/test/stderr/0121 b/test/stderr/0121
index 1e34012a4..96adb7f2f 100644
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -6,22 +6,28 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing unknown@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> unknown in "defer"?
+>>>  list element: defer
 >>> unknown in "defer"? no (end of list)
->>> list element: userx
+>>> unknown in "userx"?
+>>>  list element: userx
 >>> unknown in "userx"? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
@@ -34,9 +40,11 @@ LOG: H=(test) [127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sen
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@unknown.dom.ain
->>> list element: ! +local_domains
->>> list element: test.ex
->>> unknown.dom.ain in "test.ex"? no (end of list)
+>>> unknown.dom.ain in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  unknown.dom.ain in "test.ex"?
+>>>   list element: test.ex
+>>>  unknown.dom.ain in "test.ex"? no (end of list)
 >>> unknown.dom.ain in "! +local_domains"? yes (end of list)
 >>> calling fail_remote_domains router
 >>> fail_remote_domains router forced address failure
@@ -45,20 +53,25 @@ LOG: H=(test) [127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sen
 >>> end of ACL "check_recipient": not OK
 LOG: H=(test) [127.0.0.1] sender verify fail for <userx@unknown.dom.ain>: unrouteable mail domain "unknown.dom.ain"
 LOG: H=(test) [127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Sender verify failed
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing "unknown with spaces"@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> unknown with spaces in "defer"?
+>>>  list element: defer
 >>> unknown with spaces in "defer"? no (end of list)
->>> list element: userx
+>>> unknown with spaces in "userx"?
+>>>  list element: userx
 >>> unknown with spaces in "userx"? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
@@ -71,24 +84,30 @@ LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling userx router
 >>> routed by userx router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -98,13 +117,17 @@ LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx
 >>> verifying From: header address unknown@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing unknown@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> unknown in "defer"?
+>>>  list element: defer
 >>> unknown in "defer"? no (end of list)
->>> list element: userx
+>>> unknown in "userx"?
+>>>  list element: userx
 >>> unknown in "userx"? no (end of list)
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
@@ -115,24 +138,30 @@ LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling userx router
 >>> routed by userx router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -148,12 +177,15 @@ LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing defer@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
->>> defer in "defer"? yes (matched "defer")
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> defer in "defer"?
+>>>  list element: defer
+>>>  defer in "defer"? yes (matched "defer")
 >>> calling defer router
 >>> defer router: defer for defer@test.ex
 >>>   message: forced defer
@@ -166,24 +198,30 @@ LOG: H=(test) [127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@tes
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> userx in "defer"?
+>>>  list element: defer
 >>> userx in "defer"? no (end of list)
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling userx router
 >>> routed by userx router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -193,12 +231,15 @@ LOG: H=(test) [127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@tes
 >>> verifying from: header address <defer@test.ex>
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing defer@test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "! +local_domains"? no (matched "! +local_domains")
->>> list element: defer
->>> defer in "defer"? yes (matched "defer")
+>>> test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> defer in "defer"?
+>>>  list element: defer
+>>>  defer in "defer"? yes (matched "defer")
 >>> calling defer router
 >>> defer router: defer for defer@test.ex
 >>>   message: forced defer
@@ -212,41 +253,73 @@ LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejecte
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> foo.bar in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> list element: @
->>> list element: @[]
+>>> host in tls_advertise_hosts?
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> foo.bar in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> list element: @
->>> list element: @[]
+>>> host in tls_advertise_hosts?
+>>> foo.bar in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> list element: @
->>> list element: @[]
+>>> host in tls_advertise_hosts?
+>>> foo.bar in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> list element: @
->>> list element: @[]
+>>> host in tls_advertise_hosts?
+>>> foo.bar in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
diff --git a/test/stderr/0123 b/test/stderr/0123
index f1c38d092..d9f4557f5 100644
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0124 b/test/stderr/0124
index 6c1687b03..8eeff1d83 100644
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -6,58 +6,69 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> external.test.ex in "test.ex"? no (end of list)
+>>> external.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  external.test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>  external.test.ex in "test.ex"? no (end of list)
 >>> external.test.ex in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> list element: *.friendly.test.ex
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "*.friendly.test.ex"?
+>>>   list element: *.friendly.test.ex
 >>> sender host name required, to match against *.friendly.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
->>> host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 23)
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>>   host in "*.friendly.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>  host in "+relay_hosts"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "deny" (TESTSUITE/test-config 23)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
->>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 20)
->>> check hosts = :
->>> list element: 
->>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
->>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> external.test.ex in "test.ex"? no (end of list)
->>> external.test.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 22)
->>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 23)
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>>  using ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 20)
+>>>  check hosts = :
+>>>  host in ":"?
+>>>   list element: 
+>>>  host in ":"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 21)
+>>>  check domains = +local_domains
+>>>  external.test.ex in "+local_domains"?
+>>>   list element: +local_domains
+>>>   external.test.ex in "test.ex"?
+>>>    list element: test.ex
+>>>   external.test.ex in "test.ex"? no (end of list)
+>>>  external.test.ex in "+local_domains"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "accept" (TESTSUITE/test-config 22)
+>>>  check hosts = +relay_hosts
+>>>  host in "+relay_hosts"?
+>>>   list element: +relay_hosts
+>>>  host in "+relay_hosts"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "deny" (TESTSUITE/test-config 23)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
diff --git a/test/stderr/0130 b/test/stderr/0130
index 1c554fe27..e5a0a5899 100644
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 21)
@@ -16,13 +18,16 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> not.test.ex in "test.ex"? no (end of list)
+>>> not.test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  not.test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>  not.test.ex in "test.ex"? no (end of list)
 >>> not.test.ex in "! +local_domains"? yes (end of list)
 >>> calling islocal router
->>> list element: *
->>> not.test.ex in "*"? yes (matched "*")
+>>> not.test.ex in "*"?
+>>>  list element: *
+>>>  not.test.ex in "*"? yes (matched "*")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
diff --git a/test/stderr/0138 b/test/stderr/0138
index 550256075..f323c47a6 100644
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -6,23 +6,32 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> exim.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> userx@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -37,12 +46,14 @@
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> list@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -63,23 +74,32 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> exim.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
->>> list element: postmaster@exim.test.ex
+>>> userx@exim.test.ex in "postmaster@exim.test.ex"?
+>>>  list element: postmaster@exim.test.ex
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -118,8 +138,9 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
@@ -131,18 +152,21 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> exim.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
diff --git a/test/stderr/0139 b/test/stderr/0139
index 6fec5975f..9bd5ee201 100644
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -6,7 +6,9 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
 >>> processing "warn" (TESTSUITE/test-config 38)
@@ -70,8 +72,9 @@
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
@@ -83,18 +86,21 @@
 >>> routing userx@exim.test.ex
 >>> calling system_aliases router
 >>> system_aliases router declined for userx@exim.test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 56)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> exim.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
@@ -130,10 +136,12 @@
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 56)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> exim.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -146,7 +154,9 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
 >>> processing "warn" (TESTSUITE/test-config 38)
@@ -210,7 +220,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
 >>> processing "warn" (TESTSUITE/test-config 38)
@@ -257,7 +269,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "check_mail"
 >>> processing "warn" (TESTSUITE/test-config 38)
@@ -302,9 +316,11 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b in helo_lookup_domains? no (end of list)
 >>> using ACL "check_helo"
 >>> processing "warn" (TESTSUITE/test-config 22)
@@ -331,9 +347,11 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -409,7 +427,8 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.2]
@@ -421,9 +440,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -499,7 +520,8 @@ LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.100]
@@ -511,9 +533,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -589,7 +613,8 @@ LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.101]
@@ -601,9 +626,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -679,7 +706,8 @@ LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.102]
@@ -691,9 +719,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -769,7 +799,8 @@ LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.103]
@@ -781,9 +812,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -860,7 +893,8 @@ LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.104]
@@ -872,9 +906,11 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "warn" (TESTSUITE/test-config 26)
 >>> check dnslists = rbl.test.ex=127.0.0.1
@@ -951,7 +987,8 @@ LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254
 >>> routing a@b
 >>> calling system_aliases router
 >>> system_aliases router declined for a@b
->>> list element: userx
+>>> a in "userx"?
+>>>  list element: userx
 >>> a in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for a@b H=[V4NET.13.13.105]
diff --git a/test/stderr/0145 b/test/stderr/0145
index 71bd2d691..146ab1d02 100644
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
@@ -16,8 +18,9 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
->>> list element: *
->>> mxt10.test.ex in "*"? yes (matched "*")
+>>> mxt10.test.ex in "*"?
+>>>  list element: *
+>>>  mxt10.test.ex in "*"? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
@@ -34,9 +37,11 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
@@ -44,8 +49,9 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling domainlist router
->>> list element: *
->>> ten-1.test.ex in "*"? yes (matched "*")
+>>> ten-1.test.ex in "*"?
+>>>  list element: *
+>>>  ten-1.test.ex in "*"? yes (matched "*")
 >>> routed by domainlist router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
@@ -54,8 +60,9 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender veri
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt10.test.ex
 >>> calling domainlist router
->>> list element: *
->>> mxt10.test.ex in "*"? yes (matched "*")
+>>> mxt10.test.ex in "*"?
+>>>  list element: *
+>>>  mxt10.test.ex in "*"? yes (matched "*")
 >>> domainlist router declined for x@mxt10.test.ex
 >>> "more" is false: skipping remaining routers
 >>> no more routers
diff --git a/test/stderr/0157 b/test/stderr/0157
index fcf862a36..b658f1693 100644
--- a/test/stderr/0157
+++ b/test/stderr/0157
@@ -6,30 +6,37 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
->>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
+>>>  host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
 >>>   message: invalid sender
 >>> check senders = userx@test.ex
->>> list element: userx@test.ex
+>>> x@y.z in "userx@test.ex"?
+>>>  list element: userx@test.ex
 >>> x@y.z in "userx@test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> accept: endpass encountered - denying access
@@ -37,26 +44,32 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
->>> host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
+>>>  host in "V4NET.0.0.1"? yes (matched "V4NET.0.0.1")
 >>>   message: invalid sender
 >>> check senders = userx@test.ex
->>> list element: userx@test.ex
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> userx@test.ex in "userx@test.ex"? yes (matched "userx@test.ex")
+>>> userx@test.ex in "userx@test.ex"?
+>>>  list element: userx@test.ex
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  userx@test.ex in "userx@test.ex"? yes (matched "userx@test.ex")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -67,59 +80,72 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> list element: V4NET.0.0.1
->>> list element: V4NET.0.0.2
->>> host in "V4NET.0.0.1 : V4NET.0.0.2"? yes (matched "V4NET.0.0.2")
->>> host in "+relay_hosts"? yes (matched "+relay_hosts")
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "V4NET.0.0.1 : V4NET.0.0.2"?
+>>>   list element: V4NET.0.0.1
+>>>   list element: V4NET.0.0.2
+>>>   host in "V4NET.0.0.1 : V4NET.0.0.2"? yes (matched "V4NET.0.0.2")
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
@@ -130,34 +156,42 @@ LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
->>> list element: V4NET.0.0.1
->>> list element: V4NET.0.0.2
->>> host in "V4NET.0.0.1 : V4NET.0.0.2"? no (end of list)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "V4NET.0.0.1 : V4NET.0.0.2"?
+>>>   list element: V4NET.0.0.1
+>>>   list element: V4NET.0.0.2
+>>>  host in "V4NET.0.0.1 : V4NET.0.0.2"? no (end of list)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)
@@ -168,24 +202,29 @@ LOG: H=(test) [V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
->>> list element: 
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> b.c in "test.ex"? no (end of list)
+>>> b.c in "+local_domains"?
+>>>  list element: +local_domains
+>>>  b.c in "test.ex"?
+>>>   list element: test.ex
+>>>  b.c in "test.ex"? no (end of list)
 >>> b.c in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = V4NET.0.0.1
->>> list element: V4NET.0.0.1
+>>> host in "V4NET.0.0.1"?
+>>>  list element: V4NET.0.0.1
 >>> host in "V4NET.0.0.1"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
->>> list element: +relay_hosts
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)
diff --git a/test/stderr/0175 b/test/stderr/0175
index 7aebc1d4a..bf4d5b811 100644
--- a/test/stderr/0175
+++ b/test/stderr/0175
@@ -6,22 +6,27 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@bad.domain
->>> list element: ! +local_domains
->>> list element: test.ex
->>> bad.domain in "test.ex"? no (end of list)
+>>> bad.domain in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  bad.domain in "test.ex"?
+>>>   list element: test.ex
+>>>  bad.domain in "test.ex"? no (end of list)
 >>> bad.domain in "! +local_domains"? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
->>> bad.domain in "bad.domain"? yes (matched "bad.domain")
+>>> bad.domain in "bad.domain"?
+>>>  list element: bad.domain
+>>>  bad.domain in "bad.domain"? yes (matched "bad.domain")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
@@ -41,28 +46,35 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: S
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@bad.domain2
->>> list element: ! +local_domains
->>> list element: test.ex
->>> bad.domain2 in "test.ex"? no (end of list)
+>>> bad.domain2 in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  bad.domain2 in "test.ex"?
+>>>   list element: test.ex
+>>>  bad.domain2 in "test.ex"? no (end of list)
 >>> bad.domain2 in "! +local_domains"? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
+>>> bad.domain2 in "bad.domain"?
+>>>  list element: bad.domain
 >>> bad.domain2 in "bad.domain"? no (end of list)
 >>> fail_sender router declined for user@bad.domain2
->>> list element: ! +local_domains
+>>> bad.domain2 in "! +local_domains"?
+>>>  list element: ! +local_domains
 >>> bad.domain2 in "! +local_domains"? yes (end of list)
 >>> calling fail_sender2 router
->>> list element: bad.domain2
->>> bad.domain2 in "bad.domain2"? yes (matched "bad.domain2")
+>>> bad.domain2 in "bad.domain2"?
+>>>  list element: bad.domain2
+>>>  bad.domain2 in "bad.domain2"? yes (matched "bad.domain2")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
@@ -81,43 +93,54 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>:
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@ten-1.test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> ten-1.test.ex in "test.ex"? no (end of list)
+>>> ten-1.test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  ten-1.test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>  ten-1.test.ex in "test.ex"? no (end of list)
 >>> ten-1.test.ex in "! +local_domains"? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
+>>> ten-1.test.ex in "bad.domain"?
+>>>  list element: bad.domain
 >>> ten-1.test.ex in "bad.domain"? no (end of list)
 >>> fail_sender router declined for user@ten-1.test.ex
->>> list element: ! +local_domains
+>>> ten-1.test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
 >>> ten-1.test.ex in "! +local_domains"? yes (end of list)
 >>> calling fail_sender2 router
->>> list element: bad.domain2
+>>> ten-1.test.ex in "bad.domain2"?
+>>>  list element: bad.domain2
 >>> ten-1.test.ex in "bad.domain2"? no (end of list)
 >>> fail_sender2 router declined for user@ten-1.test.ex
->>> list element: ! +local_domains
+>>> ten-1.test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
 >>> ten-1.test.ex in "! +local_domains"? yes (end of list)
 >>> calling lookuphost router
->>> list element: *
->>> ten-1.test.ex in "*"? yes (matched "*")
+>>> ten-1.test.ex in "*"?
+>>>  list element: *
+>>>  ten-1.test.ex in "*"? yes (matched "*")
 >>> routed by lookuphost router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss
diff --git a/test/stderr/0180 b/test/stderr/0180
index 176dc2114..69801e871 100644
--- a/test/stderr/0180
+++ b/test/stderr/0180
@@ -6,14 +6,21 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> some.host in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> some.host in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -22,11 +29,18 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> some.host in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> some.host in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
diff --git a/test/stderr/0183 b/test/stderr/0183
index 0e745f812..36ab7a1b4 100644
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -32,28 +16,32 @@ routing userx@test.again.dns
 --------> srv router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=test.again.dns
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of test.again.dns (MX) using fakens
 DNS lookup of test.again.dns (MX) gave TRY_AGAIN
 test.again.dns in dns_again_means_nonexist? no (option unset)
@@ -70,27 +58,31 @@ routing abcd@test.again.dns
 --------> srv router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=test.again.dns
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN
 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
@@ -103,34 +95,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -153,29 +149,33 @@ routing usery@test.again.dns
 --------> srv router <--------
 local_part=usery domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=test.again.dns
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@test.again.dns
   domain = test.again.dns
 route_item = * $domain bydns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.again.dns' options = 'bydns'
 set transport smtp
 finding IP address for test.again.dns
 doing DNS lookup
-list element: *
-test.again.dns in "*"? yes (matched "*")
-list element: *
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.again.dns (A) using fakens
 DNS lookup of test.again.dns (A) gave TRY_AGAIN
 test.again.dns in dns_again_means_nonexist? no (option unset)
@@ -192,29 +192,33 @@ routing userz@test.again.dns
 --------> srv router <--------
 local_part=userz domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=test.again.dns
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@test.again.dns
   domain = test.again.dns
 route_item = * $domain bydns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.again.dns' options = 'bydns'
 finding IP address for test.again.dns
 doing DNS lookup
-list element: *
-test.again.dns in "*"? yes (matched "*")
-list element: *
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.again.dns (A): using cached value DNS_AGAIN
 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
@@ -227,29 +231,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -267,22 +275,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -298,28 +290,32 @@ routing userx@test.fail.dns
 --------> srv router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=test.fail.dns
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of test.fail.dns (MX) using fakens
 DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
 returning DNS_FAIL
@@ -335,27 +331,31 @@ routing abcd@test.fail.dns
 --------> srv router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=test.fail.dns
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL
 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
@@ -368,34 +368,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -418,29 +422,33 @@ routing usery@test.fail.dns
 --------> srv router <--------
 local_part=usery domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=test.fail.dns
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@test.fail.dns
   domain = test.fail.dns
 route_item = * $domain bydns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.fail.dns' options = 'bydns'
 set transport smtp
 finding IP address for test.fail.dns
 doing DNS lookup
-list element: *
-test.fail.dns in "*"? yes (matched "*")
-list element: *
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.fail.dns (A) using fakens
 DNS lookup of test.fail.dns (A) gave NO_RECOVERY
 returning DNS_FAIL
@@ -456,29 +464,33 @@ routing userz@test.fail.dns
 --------> srv router <--------
 local_part=userz domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=test.fail.dns
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@test.fail.dns
   domain = test.fail.dns
 route_item = * $domain bydns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'test.fail.dns' options = 'bydns'
 finding IP address for test.fail.dns
 doing DNS lookup
-list element: *
-test.fail.dns in "*"? yes (matched "*")
-list element: *
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
+ list element: *
 DNS lookup of test.fail.dns (A): using cached value DNS_FAIL
 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
@@ -491,29 +503,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -531,22 +547,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -562,28 +562,32 @@ routing userx@nonexist.test.ex
 --------> srv router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=nonexist.test.ex
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.test.ex
   domain = nonexist.test.ex
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 DNS lookup of nonexist.test.ex (MX) using fakens
 DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -601,27 +605,31 @@ routing abcd@nonexist.test.ex
 --------> srv router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=nonexist.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH
 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
@@ -635,34 +643,38 @@ routing abcd@ten-1.test.ex
 --------> srv router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+abcd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 abcd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+abcd in "usery:userz"?
+ list element: usery
+ list element: userz
 abcd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=abcd domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+abcd in "!userd"?
+ list element: !userd
 abcd in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for abcd@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000
 ten-1.test.ex (MX resp) DNSSEC
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -685,29 +697,33 @@ routing usery@nonexist.test.ex
 --------> srv router <--------
 local_part=usery domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+usery in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 usery in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=usery domain=nonexist.test.ex
 checking local_parts
-list element: usery
-usery in "usery:userz"? yes (matched "usery")
+usery in "usery:userz"?
+ list element: usery
+ usery in "usery:userz"? yes (matched "usery")
 calling useryz router
 useryz router called for usery@nonexist.test.ex
   domain = nonexist.test.ex
 route_item = * $domain bydns
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 set transport smtp
 finding IP address for nonexist.test.ex
 doing DNS lookup
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
-list element: *
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
+ list element: *
 DNS lookup of nonexist.test.ex (A) using fakens
 DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -724,29 +740,33 @@ routing userz@nonexist.test.ex
 --------> srv router <--------
 local_part=userz domain=nonexist.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userz domain=nonexist.test.ex
 checking local_parts
-list element: usery
-list element: userz
-userz in "usery:userz"? yes (matched "userz")
+userz in "usery:userz"?
+ list element: usery
+ list element: userz
+ userz in "usery:userz"? yes (matched "userz")
 calling useryz router
 useryz router called for userz@nonexist.test.ex
   domain = nonexist.test.ex
 route_item = * $domain bydns
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
 original list of hosts = '$domain' options = 'bydns'
 expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 finding IP address for nonexist.test.ex
 doing DNS lookup
-list element: *
-nonexist.test.ex in "*"? yes (matched "*")
-list element: *
+nonexist.test.ex in "*"?
+ list element: *
+ nonexist.test.ex in "*"? yes (matched "*")
+ list element: *
 DNS lookup of nonexist.test.ex (A): using cached value DNS_NOMATCH
 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
@@ -759,29 +779,33 @@ routing xyz@ten-1.test.ex
 --------> srv router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+xyz in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 xyz in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: usery
-list element: userz
+xyz in "usery:userz"?
+ list element: usery
+ list element: userz
 xyz in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xyz domain=ten-1.test.ex
 checking local_parts
-list element: !userd
+xyz in "!userd"?
+ list element: !userd
 xyz in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA
-list element: *
+ list element: *
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
@@ -799,22 +823,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -830,21 +838,24 @@ routing srv@test.again.dns
 --------> srv router <--------
 local_part=srv domain=test.again.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
-srv in "^srv"? yes (matched "^srv")
+srv in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
+ srv in "^srv"? yes (matched "^srv")
 calling srv router
 srv router called for srv@test.again.dns
   domain = test.again.dns
-list element: *
-test.again.dns in "*"? yes (matched "*")
+test.again.dns in "*"?
+ list element: *
+ test.again.dns in "*"? yes (matched "*")
 DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens
 DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN
 _smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset)
 returning DNS_AGAIN
  writing neg-cache entry for _smtp._tcp.test.again.dns-SRV-xxxx, ttl -1
-list element: test.fail.dns
+test.again.dns in "test.fail.dns"?
+ list element: test.fail.dns
 test.again.dns in "test.fail.dns"? no (end of list)
 srv router: defer for srv@test.again.dns
   message: host lookup did not complete
@@ -857,29 +868,33 @@ routing srv@test.fail.dns
 --------> srv router <--------
 local_part=srv domain=test.fail.dns
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
-srv in "^srv"? yes (matched "^srv")
+srv in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
+ srv in "^srv"? yes (matched "^srv")
 calling srv router
 srv router called for srv@test.fail.dns
   domain = test.fail.dns
-list element: *
-test.fail.dns in "*"? yes (matched "*")
+test.fail.dns in "*"?
+ list element: *
+ test.fail.dns in "*"? yes (matched "*")
 DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens
 DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY
 returning DNS_FAIL
  writing neg-cache entry for _smtp._tcp.test.fail.dns-SRV-xxxx, ttl -1
-list element: test.fail.dns
-test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
+test.fail.dns in "test.fail.dns"?
+ list element: test.fail.dns
+ test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
 DNS_FAIL treated as DNS_NODATA (domain in srv_fail_domains)
 DNS lookup of test.fail.dns (MX) using fakens
 DNS lookup of test.fail.dns (MX) gave NO_RECOVERY
 returning DNS_FAIL
  writing neg-cache entry for test.fail.dns-MX-xxxx, ttl -1
-list element: test.fail.dns
-test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
+test.fail.dns in "test.fail.dns"?
+ list element: test.fail.dns
+ test.fail.dns in "test.fail.dns"? yes (matched "test.fail.dns")
 DNS_FAIL treated as DNS_NODATA (domain in mx_fail_domains)
-list element: *
+ list element: *
 DNS lookup of test.fail.dns (A) using fakens
 DNS lookup of test.fail.dns (A) gave NO_RECOVERY
 returning DNS_FAIL
@@ -891,22 +906,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -922,28 +921,32 @@ routing userx@nonexist.example.com
 --------> srv router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' not found in local cache
-compiled RE '^srv' saved in local cache
+userx in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' not found in local cache
+ compiled RE '^srv' saved in local cache
 userx in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: usery
-list element: userz
+userx in "usery:userz"?
+ list element: usery
+ list element: userz
 userx in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userx domain=nonexist.example.com
 checking local_parts
-list element: !userd
+userx in "!userd"?
+ list element: !userd
 userx in "!userd"? yes (end of list)
 calling lookuphost router
 lookuphost router called for userx@nonexist.example.com
   domain = nonexist.example.com
-list element: *
-nonexist.example.com in "*"? yes (matched "*")
+nonexist.example.com in "*"?
+ list element: *
+ nonexist.example.com in "*"? yes (matched "*")
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
@@ -961,22 +964,25 @@ routing userd@nonexist.example.com
 --------> srv router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: ^srv
-compiled caseless RE '^srv' found in local cache
+userd in "^srv"?
+ list element: ^srv
+ compiled caseless RE '^srv' found in local cache
 userd in "^srv"? no (end of list)
 srv router skipped: local_parts mismatch
 --------> useryz router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: usery
-list element: userz
+userd in "usery:userz"?
+ list element: usery
+ list element: userz
 userd in "usery:userz"? no (end of list)
 useryz router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=userd domain=nonexist.example.com
 checking local_parts
-list element: !userd
-userd in "!userd"? no (matched "!userd")
+userd in "!userd"?
+ list element: !userd
+ userd in "!userd"? no (matched "!userd")
 lookuphost router skipped: local_parts mismatch
 --------> delay router <--------
 local_part=userd domain=nonexist.example.com
@@ -991,8 +997,9 @@ checking "condition" "${acl {delay}}"...
 calling delay router
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
-list element: *
-nonexist.example.com in "*"? yes (matched "*")
+nonexist.example.com in "*"?
+ list element: *
+ nonexist.example.com in "*"? yes (matched "*")
 DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
diff --git a/test/stderr/0230 b/test/stderr/0230
index 26c1e6760..c70bba481 100644
--- a/test/stderr/0230
+++ b/test/stderr/0230
@@ -7,7 +7,8 @@ LOG: SMTP connection from [192.168.1.2]:1117
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 LOG: SMTP connection from [192.168.1.2]:1117 closed by QUIT
 
 ******** SERVER ********
diff --git a/test/stderr/0234 b/test/stderr/0234
index d044c19eb..709f73359 100644
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,16 +6,20 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: @mx_any
->>> d in "@mx_any"? no (end of list)
+>>> d in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  d in "@mx_any"?
+>>>   list element: @mx_any
+>>>  d in "@mx_any"? no (end of list)
 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
@@ -26,22 +30,26 @@ LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: @mx_any
+>>> mxt1.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  mxt1.test.ex in "@mx_any"?
+>>>   list element: @mx_any
 >>> local host has lowest MX
->>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>>   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
->>> list element: +relay_domains
->>> list element: @mx_any
+>>> mxt6.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  mxt6.test.ex in "@mx_any"?
+>>>   list element: @mx_any
 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
->>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>>   mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
diff --git a/test/stderr/0243 b/test/stderr/0243
index 59571b868..16c2f7aec 100644
--- a/test/stderr/0243
+++ b/test/stderr/0243
@@ -6,37 +6,48 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> xxxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxxx in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net
->>> list element: *.demon.net
->>> nl.demon.net in "*.demon.net"? yes (matched "*.demon.net")
+>>> nl.demon.net in "*.demon.net"?
+>>>  list element: *.demon.net
+>>>  nl.demon.net in "*.demon.net"? yes (matched "*.demon.net")
 >>> calling auto_antwoord router
 >>> routed by auto_antwoord router (unseen)
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing faq@nl.demon.net
->>> list element: nl.demon.net
->>> nl.demon.net in "nl.demon.net:*.nl.demon.net:fax-gw.demon.nl: www-3.demon.nl : localhost"? yes (matched "nl.demon.net")
+>>> nl.demon.net in "nl.demon.net:*.nl.demon.net:fax-gw.demon.nl: www-3.demon.nl : localhost"?
+>>>  list element: nl.demon.net
+>>>  nl.demon.net in "nl.demon.net:*.nl.demon.net:fax-gw.demon.nl: www-3.demon.nl : localhost"? yes (matched "nl.demon.net")
 >>> calling algemeen_aliases router
 >>> routed by algemeen_aliases router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: nl.demon.net
->>> nl.demon.net in "nl.demon.net"? yes (matched "nl.demon.net")
->>> nl.demon.net in "+local_domains"? yes (matched "+local_domains")
+>>> nl.demon.net in "+local_domains"?
+>>>  list element: +local_domains
+>>>  nl.demon.net in "nl.demon.net"?
+>>>   list element: nl.demon.net
+>>>   nl.demon.net in "nl.demon.net"? yes (matched "nl.demon.net")
+>>>  nl.demon.net in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
diff --git a/test/stderr/0251 b/test/stderr/0251
index f14706a6d..12bc5cf6b 100644
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
@@ -16,35 +18,44 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> list element: listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> list element: TESTSUITE/aux-fixed/0251.restrict.oklist
->>> list element: sender
->>> sender in "sender"? yes (matched "sender")
->>> ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
+>>>  sender in "sender"?
+>>>   list element: sender
+>>>   sender in "sender"? yes (matched "sender")
+>>>  ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
 >>> calling exeter_listr router
 >>> routed by exeter_listr router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing xxx@listr.test.ex
->>> list element: listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> list element: zzzz
->>> list element: zzzz
->>> sender in "zzzz"? no (end of list)
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> ok@sender in "zzzz"?
+>>>  list element: zzzz
+>>>  sender in "zzzz"?
+>>>   list element: zzzz
+>>>  sender in "zzzz"? no (end of list)
 >>> ok@sender in "zzzz"? no (end of list)
->>> list element: listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> list element: *.test.ex
->>> listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
->>> listr.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> listr.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  listr.test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   list element: *.test.ex
+>>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
@@ -53,23 +64,28 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> list element: listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> list element: TESTSUITE/aux-fixed/0251.restrict.oklist
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
 >>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? no (end of list)
->>> list element: listr.test.ex
->>> listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>> listr.test.ex in "listr.test.ex"?
+>>>  list element: listr.test.ex
+>>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> list element: *.test.ex
->>> listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
->>> listr.test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> listr.test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  listr.test.ex in "test.ex : *.test.ex"?
+>>>   list element: test.ex
+>>>   list element: *.test.ex
+>>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 
diff --git a/test/stderr/0255 b/test/stderr/0255
index 47b223048..aa85cd990 100644
--- a/test/stderr/0255
+++ b/test/stderr/0255
@@ -6,7 +6,8 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last was "four")
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -16,5 +17,6 @@ LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 LOG: SMTP call from [V4NET.0.0.0] dropped: too many unrecognized commands (last was "two")
diff --git a/test/stderr/0259 b/test/stderr/0259
index 1f2bbb61f..bc63b6295 100644
--- a/test/stderr/0259
+++ b/test/stderr/0259
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -18,9 +20,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -30,9 +34,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -42,9 +48,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -54,9 +62,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -66,9 +76,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -78,7 +90,9 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
diff --git a/test/stderr/0275 b/test/stderr/0275
index cebbabbd7..93f03d09d 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -29,140 +13,164 @@ Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
 Testing userx@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering userx@test.ex
-list element: +hold_domains
- start sublist hold_domains
-  list element: ! *.ex
-  test.ex in "! *.ex"? no (matched "! *.ex")
- end sublist hold_domains
-list element: +not_queue_domains
- start sublist not_queue_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist not_queue_domains
-test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
+test.ex in percent_hack_domains?
+ list element: +hold_domains
+  start sublist hold_domains
+   test.ex in "! *.ex"?
+   ╎list element: ! *.ex
+   ╎test.ex in "! *.ex"? no (matched "! *.ex")
+  end sublist hold_domains
+ list element: +not_queue_domains
+  start sublist not_queue_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist not_queue_domains
+ test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r00 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache
- start sublist nocache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist nocache
+test.ex in "+nocache"?
+ list element: +nocache
+  start sublist nocache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist nocache
 test.ex in "+nocache"? no (end of list)
 r00 router skipped: domains mismatch
 --------> r01 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache
- start sublist nocache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist nocache
+test.ex in "+nocache"?
+ list element: +nocache
+  start sublist nocache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist nocache
 test.ex in "+nocache"? no (end of list)
 r01 router skipped: domains mismatch
 --------> r02 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache2
- start sublist nocache2
-  list element: +nocache
-   start sublist nocache
-   ╎list element: userx
-   ╎test.ex in "userx"? no (end of list)
-   end sublist nocache
-  test.ex in "+nocache"? no (end of list)
- end sublist nocache2
+test.ex in "+nocache2"?
+ list element: +nocache2
+  start sublist nocache2
+   test.ex in "+nocache"?
+   ╎list element: +nocache
+   ╎ start sublist nocache
+   ╎  test.ex in "userx"?
+   ╎   list element: userx
+   ╎  test.ex in "userx"? no (end of list)
+   ╎ end sublist nocache
+   test.ex in "+nocache"? no (end of list)
+  end sublist nocache2
 test.ex in "+nocache2"? no (end of list)
 r02 router skipped: domains mismatch
 --------> r03 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache2
- start sublist nocache2
-  list element: +nocache
-   start sublist nocache
-   ╎list element: userx
-   ╎test.ex in "userx"? no (end of list)
-   end sublist nocache
-  test.ex in "+nocache"? no (end of list)
- end sublist nocache2
+test.ex in "+nocache2"?
+ list element: +nocache2
+  start sublist nocache2
+   test.ex in "+nocache"?
+   ╎list element: +nocache
+   ╎ start sublist nocache
+   ╎  test.ex in "userx"?
+   ╎   list element: userx
+   ╎  test.ex in "userx"? no (end of list)
+   ╎ end sublist nocache
+   test.ex in "+nocache"? no (end of list)
+  end sublist nocache2
 test.ex in "+nocache2"? no (end of list)
 r03 router skipped: domains mismatch
 --------> r04 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +forcecache
- start sublist forcecache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist forcecache
+test.ex in "+forcecache"?
+ list element: +forcecache
+  start sublist forcecache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist forcecache
 test.ex in "+forcecache"? no (end of list)
 r04 router skipped: domains mismatch
 --------> r05 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +forcecache
- start sublist forcecache
-cached no match for +forcecache
-cached lookup data = NULL
+test.ex in "+forcecache"?
+ list element: +forcecache
+  start sublist forcecache
+ cached no match for +forcecache
+ cached lookup data = NULL
 test.ex in "+forcecache"? no (end of list)
 r05 router skipped: domains mismatch
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +never_domains
- start sublist never_domains
-  list element: never.ex
-  test.ex in "never.ex"? no (end of list)
- end sublist never_domains
-list element: +n1_domains
- start sublist n1_domains
-  list element: never1.ex
-  test.ex in "never1.ex"? no (end of list)
- end sublist n1_domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains")
+test.ex in "+never_domains : +n1_domains : ! +local_domains"?
+ list element: +never_domains
+  start sublist never_domains
+   test.ex in "never.ex"?
+   ╎list element: never.ex
+   test.ex in "never.ex"? no (end of list)
+  end sublist never_domains
+ list element: +n1_domains
+  start sublist n1_domains
+   test.ex in "never1.ex"?
+   ╎list element: never1.ex
+   test.ex in "never1.ex"? no (end of list)
+  end sublist n1_domains
+ list element: ! +local_domains
+  start sublist local_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +never_domains
- start sublist never_domains
-cached no match for +never_domains
-cached lookup data = NULL
-list element: +n2_domains
- start sublist n2_domains
-  list element: never2.ex
-  list element: +n1_domains
-   start sublist n1_domains
-  cached no match for +n1_domains
-  cached lookup data = NULL
-  test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
- end sublist n2_domains
-list element: !+local_domains
- start sublist local_domains
-cached yes match for +local_domains
-cached lookup data = test.ex
-test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached)
+test.ex in "+never_domains : +n2_domains : !+local_domains"?
+ list element: +never_domains
+  start sublist never_domains
+ cached no match for +never_domains
+ cached lookup data = NULL
+ list element: +n2_domains
+  start sublist n2_domains
+   test.ex in "<; never2.ex ; +n1_domains"?
+   ╎list element: never2.ex
+   ╎list element: +n1_domains
+   ╎ start sublist n1_domains
+   ╎cached no match for +n1_domains
+   ╎cached lookup data = NULL
+   test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
+  end sublist n2_domains
+ list element: !+local_domains
+  start sublist local_domains
+ cached yes match for +local_domains
+ cached lookup data = test.ex
+ test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +local_domains
- start sublist local_domains
-cached yes match for +local_domains
-cached lookup data = test.ex
-test.ex in "+local_domains"? yes (matched "+local_domains" - cached)
+test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+ cached yes match for +local_domains
+ cached lookup data = test.ex
+ test.ex in "+local_domains"? yes (matched "+local_domains" - cached)
 checking local_parts
-list element: userx
-userx in "userx"? yes (matched "userx")
+userx in "userx"?
+ list element: userx
+ userx in "userx"? yes (matched "userx")
 calling r3 router
 r3 router called for userx@test.ex
   domain = test.ex
@@ -179,22 +187,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -243,10 +235,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1236
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -276,152 +264,178 @@ Delivery address list:
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
-list element: +hold_domains
- start sublist hold_domains
-  list element: ! *.ex
-  test.ex in "! *.ex"? no (matched "! *.ex")
- end sublist hold_domains
-list element: +not_queue_domains
- start sublist not_queue_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist not_queue_domains
-test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
-list element: +hold_domains
- start sublist hold_domains
-cached no match for +hold_domains
+test.ex in percent_hack_domains?
+ list element: +hold_domains
+  start sublist hold_domains
+   test.ex in "! *.ex"?
+   ╎list element: ! *.ex
+   ╎test.ex in "! *.ex"? no (matched "! *.ex")
+  end sublist hold_domains
+ list element: +not_queue_domains
+  start sublist not_queue_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist not_queue_domains
+ test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
+test.ex in hold_domains?
+ list element: +hold_domains
+  start sublist hold_domains
+ cached no match for +hold_domains
 test.ex in hold_domains? no (end of list)
 unique = userx@test.ex
 no   domain  retry record
 no   address retry record
 userx@test.ex: queued for routing
-list element: !+not_queue_domains
- start sublist not_queue_domains
-cached yes match for +not_queue_domains
-test.ex in queue_domains? no (matched "!+not_queue_domains" - cached)
+test.ex in queue_domains?
+ list element: !+not_queue_domains
+  start sublist not_queue_domains
+ cached yes match for +not_queue_domains
+ test.ex in queue_domains? no (matched "!+not_queue_domains" - cached)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r00 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache
- start sublist nocache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist nocache
+test.ex in "+nocache"?
+ list element: +nocache
+  start sublist nocache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist nocache
 test.ex in "+nocache"? no (end of list)
 r00 router skipped: domains mismatch
 --------> r01 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache
- start sublist nocache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist nocache
+test.ex in "+nocache"?
+ list element: +nocache
+  start sublist nocache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist nocache
 test.ex in "+nocache"? no (end of list)
 r01 router skipped: domains mismatch
 --------> r02 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache2
- start sublist nocache2
-  list element: +nocache
-   start sublist nocache
-   ╎list element: userx
-   ╎test.ex in "userx"? no (end of list)
-   end sublist nocache
-  test.ex in "+nocache"? no (end of list)
- end sublist nocache2
+test.ex in "+nocache2"?
+ list element: +nocache2
+  start sublist nocache2
+   test.ex in "+nocache"?
+   ╎list element: +nocache
+   ╎ start sublist nocache
+   ╎  test.ex in "userx"?
+   ╎   list element: userx
+   ╎  test.ex in "userx"? no (end of list)
+   ╎ end sublist nocache
+   test.ex in "+nocache"? no (end of list)
+  end sublist nocache2
 test.ex in "+nocache2"? no (end of list)
 r02 router skipped: domains mismatch
 --------> r03 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +nocache2
- start sublist nocache2
-  list element: +nocache
-   start sublist nocache
-   ╎list element: userx
-   ╎test.ex in "userx"? no (end of list)
-   end sublist nocache
-  test.ex in "+nocache"? no (end of list)
- end sublist nocache2
+test.ex in "+nocache2"?
+ list element: +nocache2
+  start sublist nocache2
+   test.ex in "+nocache"?
+   ╎list element: +nocache
+   ╎ start sublist nocache
+   ╎  test.ex in "userx"?
+   ╎   list element: userx
+   ╎  test.ex in "userx"? no (end of list)
+   ╎ end sublist nocache
+   test.ex in "+nocache"? no (end of list)
+  end sublist nocache2
 test.ex in "+nocache2"? no (end of list)
 r03 router skipped: domains mismatch
 --------> r04 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +forcecache
- start sublist forcecache
-  list element: userx
-  test.ex in "userx"? no (end of list)
- end sublist forcecache
+test.ex in "+forcecache"?
+ list element: +forcecache
+  start sublist forcecache
+   test.ex in "userx"?
+   ╎list element: userx
+   test.ex in "userx"? no (end of list)
+  end sublist forcecache
 test.ex in "+forcecache"? no (end of list)
 r04 router skipped: domains mismatch
 --------> r05 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +forcecache
- start sublist forcecache
-cached no match for +forcecache
-cached lookup data = NULL
+test.ex in "+forcecache"?
+ list element: +forcecache
+  start sublist forcecache
+ cached no match for +forcecache
+ cached lookup data = NULL
 test.ex in "+forcecache"? no (end of list)
 r05 router skipped: domains mismatch
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +never_domains
- start sublist never_domains
-  list element: never.ex
-  test.ex in "never.ex"? no (end of list)
- end sublist never_domains
-list element: +n1_domains
- start sublist n1_domains
-  list element: never1.ex
-  test.ex in "never1.ex"? no (end of list)
- end sublist n1_domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
-test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains")
+test.ex in "+never_domains : +n1_domains : ! +local_domains"?
+ list element: +never_domains
+  start sublist never_domains
+   test.ex in "never.ex"?
+   ╎list element: never.ex
+   test.ex in "never.ex"? no (end of list)
+  end sublist never_domains
+ list element: +n1_domains
+  start sublist n1_domains
+   test.ex in "never1.ex"?
+   ╎list element: never1.ex
+   test.ex in "never1.ex"? no (end of list)
+  end sublist n1_domains
+ list element: ! +local_domains
+  start sublist local_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+ test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +never_domains
- start sublist never_domains
-cached no match for +never_domains
-cached lookup data = NULL
-list element: +n2_domains
- start sublist n2_domains
-  list element: never2.ex
-  list element: +n1_domains
-   start sublist n1_domains
-  cached no match for +n1_domains
-  cached lookup data = NULL
-  test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
- end sublist n2_domains
-list element: !+local_domains
- start sublist local_domains
-cached yes match for +local_domains
-cached lookup data = test.ex
-test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached)
+test.ex in "+never_domains : +n2_domains : !+local_domains"?
+ list element: +never_domains
+  start sublist never_domains
+ cached no match for +never_domains
+ cached lookup data = NULL
+ list element: +n2_domains
+  start sublist n2_domains
+   test.ex in "<; never2.ex ; +n1_domains"?
+   ╎list element: never2.ex
+   ╎list element: +n1_domains
+   ╎ start sublist n1_domains
+   ╎cached no match for +n1_domains
+   ╎cached lookup data = NULL
+   test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
+  end sublist n2_domains
+ list element: !+local_domains
+  start sublist local_domains
+ cached yes match for +local_domains
+ cached lookup data = test.ex
+ test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: +local_domains
- start sublist local_domains
-cached yes match for +local_domains
-cached lookup data = test.ex
-test.ex in "+local_domains"? yes (matched "+local_domains" - cached)
+test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+ cached yes match for +local_domains
+ cached lookup data = test.ex
+ test.ex in "+local_domains"? yes (matched "+local_domains" - cached)
 checking local_parts
-list element: userx
-userx in "userx"? yes (matched "userx")
+userx in "userx"?
+ list element: userx
+ userx in "userx"? yes (matched "userx")
 calling r3 router
 r3 router called for userx@test.ex
   domain = test.ex
@@ -497,22 +511,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -534,12 +532,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< HELO test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [127.0.0.1]
 sender_rcvhost = [127.0.0.1] (helo=test)
@@ -550,39 +550,45 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< RCPT TO:<error@test.ex>
-list element: +hold_domains
- start sublist hold_domains
-  list element: ! *.ex
-  test.ex in "! *.ex"? no (matched "! *.ex")
- end sublist hold_domains
-list element: +not_queue_domains
- start sublist not_queue_domains
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
- end sublist not_queue_domains
-test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
+test.ex in percent_hack_domains?
+ list element: +hold_domains
+  start sublist hold_domains
+   test.ex in "! *.ex"?
+   ╎list element: ! *.ex
+   ╎test.ex in "! *.ex"? no (matched "! *.ex")
+  end sublist hold_domains
+ list element: +not_queue_domains
+  start sublist not_queue_domains
+   test.ex in "test.ex"?
+   ╎list element: test.ex
+   ╎test.ex in "test.ex"? yes (matched "test.ex")
+  end sublist not_queue_domains
+ test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
 processing "accept" (TESTSUITE/test-config 102)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying error@test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering error@test.ex
-list element: +hold_domains
- start sublist hold_domains
-cached no match for +hold_domains
-list element: +not_queue_domains
- start sublist not_queue_domains
-cached yes match for +not_queue_domains
-test.ex in percent_hack_domains? yes (matched "+not_queue_domains" - cached)
+test.ex in percent_hack_domains?
+ list element: +hold_domains
+  start sublist hold_domains
+ cached no match for +hold_domains
+ list element: +not_queue_domains
+  start sublist not_queue_domains
+ cached yes match for +not_queue_domains
+ test.ex in percent_hack_domains? yes (matched "+not_queue_domains" - cached)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing error@test.ex
 --------> r0f router <--------
 local_part=error domain=test.ex
 checking domains
-list element: +no_such_list
- start sublist no_such_list
+test.ex in "+no_such_list"?
+ list element: +no_such_list
+  start sublist no_such_list
 LOG: MAIN PANIC
   unknown named domain list "+no_such_list"
+  test.ex in "+no_such_list"? list match deferred for +no_such_list
 domains check lookup or other defer
   ----------- end verify ------------
   accept: condition test deferred in inline ACL
diff --git a/test/stderr/0277 b/test/stderr/0277
index e8e732dd1..a2c32c1eb 100644
--- a/test/stderr/0277
+++ b/test/stderr/0277
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -28,12 +12,14 @@ sender_rcvhost = [V4NET.2.3.4]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.3.4]
-list element: +lookup_hosts
- start sublist lookup_hosts
-  list element: V4NET.2.3.4
-  host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
- end sublist lookup_hosts
-host in host_lookup? yes (matched "+lookup_hosts")
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
+   ╎host in "V4NET.2.3.4"? yes (matched "V4NET.2.3.4")
+  end sublist lookup_hosts
+  host in host_lookup? yes (matched "+lookup_hosts")
 looking up host name for V4NET.2.3.4
 DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 4.3.2.V4NET.in-addr.arpa (PTR) gave HOST_NOT_FOUND
@@ -47,15 +33,17 @@ sender_fullhost = [V4NET.2.3.4]
 sender_rcvhost = [V4NET.2.3.4]
 set_process_info: pppp handling incoming connection from [V4NET.2.3.4]
 host in host_reject_connection? no (option unset)
-list element: +lookup_hosts
- start sublist lookup_hosts
-cached yes match for +lookup_hosts
-host in sender_unqualified_hosts? yes (matched "+lookup_hosts" - cached)
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached yes match for +lookup_hosts
+  host in sender_unqualified_hosts? yes (matched "+lookup_hosts" - cached)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< quit
@@ -67,22 +55,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -94,38 +66,45 @@ sender_rcvhost = [V4NET.6.7.8]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.6.7.8]
-list element: +lookup_hosts
- start sublist lookup_hosts
-  list element: V4NET.2.3.4
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
   host in "V4NET.2.3.4"? no (end of list)
- end sublist lookup_hosts
-list element: !+never_hosts
- start sublist never_hosts
-  list element: V4NET.6.7.8
-  host in "V4NET.6.7.8"? yes (matched "V4NET.6.7.8")
- end sublist never_hosts
-host in host_lookup? no (matched "!+never_hosts")
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
+   ╎host in "V4NET.6.7.8"? yes (matched "V4NET.6.7.8")
+  end sublist never_hosts
+  host in host_lookup? no (matched "!+never_hosts")
 set_process_info: pppp handling incoming connection from [V4NET.6.7.8]
 host in host_reject_connection? no (option unset)
-list element: +lookup_hosts
- start sublist lookup_hosts
-cached no match for +lookup_hosts
-list element: !+n2_hosts
- start sublist n2_hosts
-  list element: V4NET.2.2.2
-  list element: +n1_hosts
-   start sublist n1_hosts
-   ╎list element: V4NET.1.1.1
-   ╎host in "V4NET.1.1.1"? no (end of list)
-   end sublist n1_hosts
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎  host in "V4NET.1.1.1"? no (end of list)
+   ╎ end sublist n1_hosts
   host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
- end sublist n2_hosts
+  end sublist n2_hosts
 host in sender_unqualified_hosts? yes (end of list)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< quit
@@ -137,22 +116,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -164,16 +127,19 @@ sender_rcvhost = [V4NET.10.11.12]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.10.11.12]
-list element: +lookup_hosts
- start sublist lookup_hosts
-  list element: V4NET.2.3.4
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
   host in "V4NET.2.3.4"? no (end of list)
- end sublist lookup_hosts
-list element: !+never_hosts
- start sublist never_hosts
-  list element: V4NET.6.7.8
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
   host in "V4NET.6.7.8"? no (end of list)
- end sublist never_hosts
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.10.11.12
 DNS lookup of 12.11.10.V4NET.in-addr.arpa (PTR) using fakens
@@ -188,25 +154,29 @@ sender_fullhost = [V4NET.10.11.12]
 sender_rcvhost = [V4NET.10.11.12]
 set_process_info: pppp handling incoming connection from [V4NET.10.11.12]
 host in host_reject_connection? no (option unset)
-list element: +lookup_hosts
- start sublist lookup_hosts
-cached no match for +lookup_hosts
-list element: !+n2_hosts
- start sublist n2_hosts
-  list element: V4NET.2.2.2
-  list element: +n1_hosts
-   start sublist n1_hosts
-   ╎list element: V4NET.1.1.1
-   ╎host in "V4NET.1.1.1"? no (end of list)
-   end sublist n1_hosts
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎  host in "V4NET.1.1.1"? no (end of list)
+   ╎ end sublist n1_hosts
   host in "<; V4NET.2.2.2 ; +n1_hosts"? no (end of list)
- end sublist n2_hosts
+  end sublist n2_hosts
 host in sender_unqualified_hosts? yes (end of list)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< quit
@@ -218,22 +188,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -245,16 +199,19 @@ sender_rcvhost = [V4NET.1.1.1]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.1.1.1]
-list element: +lookup_hosts
- start sublist lookup_hosts
-  list element: V4NET.2.3.4
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
   host in "V4NET.2.3.4"? no (end of list)
- end sublist lookup_hosts
-list element: !+never_hosts
- start sublist never_hosts
-  list element: V4NET.6.7.8
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
   host in "V4NET.6.7.8"? no (end of list)
- end sublist never_hosts
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.1.1.1
 DNS lookup of 1.1.1.V4NET.in-addr.arpa (PTR) using fakens
@@ -269,25 +226,29 @@ sender_fullhost = [V4NET.1.1.1]
 sender_rcvhost = [V4NET.1.1.1]
 set_process_info: pppp handling incoming connection from [V4NET.1.1.1]
 host in host_reject_connection? no (option unset)
-list element: +lookup_hosts
- start sublist lookup_hosts
-cached no match for +lookup_hosts
-list element: !+n2_hosts
- start sublist n2_hosts
-  list element: V4NET.2.2.2
-  list element: +n1_hosts
-   start sublist n1_hosts
-   ╎list element: V4NET.1.1.1
-   ╎host in "V4NET.1.1.1"? yes (matched "V4NET.1.1.1")
-   end sublist n1_hosts
-  host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "+n1_hosts")
- end sublist n2_hosts
-host in sender_unqualified_hosts? no (matched "!+n2_hosts")
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎list element: +n1_hosts
+   ╎ start sublist n1_hosts
+   ╎  host in "V4NET.1.1.1"?
+   ╎   list element: V4NET.1.1.1
+   ╎   host in "V4NET.1.1.1"? yes (matched "V4NET.1.1.1")
+   ╎ end sublist n1_hosts
+   ╎host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "+n1_hosts")
+  end sublist n2_hosts
+  host in sender_unqualified_hosts? no (matched "!+n2_hosts")
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< quit
@@ -299,22 +260,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -326,16 +271,19 @@ sender_rcvhost = [V4NET.2.2.2]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.2.2.2]
-list element: +lookup_hosts
- start sublist lookup_hosts
-  list element: V4NET.2.3.4
+host in host_lookup?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+  host in "V4NET.2.3.4"?
+   ╎list element: V4NET.2.3.4
   host in "V4NET.2.3.4"? no (end of list)
- end sublist lookup_hosts
-list element: !+never_hosts
- start sublist never_hosts
-  list element: V4NET.6.7.8
+  end sublist lookup_hosts
+ list element: !+never_hosts
+  start sublist never_hosts
+  host in "V4NET.6.7.8"?
+   ╎list element: V4NET.6.7.8
   host in "V4NET.6.7.8"? no (end of list)
- end sublist never_hosts
+  end sublist never_hosts
 host in host_lookup? yes (end of list)
 looking up host name for V4NET.2.2.2
 DNS lookup of 2.2.2.V4NET.in-addr.arpa (PTR) using fakens
@@ -350,20 +298,23 @@ sender_fullhost = [V4NET.2.2.2]
 sender_rcvhost = [V4NET.2.2.2]
 set_process_info: pppp handling incoming connection from [V4NET.2.2.2]
 host in host_reject_connection? no (option unset)
-list element: +lookup_hosts
- start sublist lookup_hosts
-cached no match for +lookup_hosts
-list element: !+n2_hosts
- start sublist n2_hosts
-  list element: V4NET.2.2.2
-  host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "V4NET.2.2.2")
- end sublist n2_hosts
-host in sender_unqualified_hosts? no (matched "!+n2_hosts")
+host in sender_unqualified_hosts?
+ list element: +lookup_hosts
+  start sublist lookup_hosts
+ cached no match for +lookup_hosts
+ list element: !+n2_hosts
+  start sublist n2_hosts
+  host in "<; V4NET.2.2.2 ; +n1_hosts"?
+   ╎list element: V4NET.2.2.2
+   ╎host in "<; V4NET.2.2.2 ; +n1_hosts"? yes (matched "V4NET.2.2.2")
+  end sublist n2_hosts
+  host in sender_unqualified_hosts? no (matched "!+n2_hosts")
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< quit
diff --git a/test/stderr/0278 b/test/stderr/0278
index 8c1c98d24..4cacfefbb 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -34,54 +18,61 @@ routing CALLER@test.ex
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-  list element: never
-  CALLER in "never"? no (end of list)
- end sublist never_localparts
-list element: +n1_localparts
- start sublist n1_localparts
-  list element: never1
-  CALLER in "never1"? no (end of list)
- end sublist n1_localparts
-list element: ! +local_localparts
- start sublist local_localparts
-  list element: CALLER
-  CALLER in "CALLER"? yes (matched "CALLER")
- end sublist local_localparts
-data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
-CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
+CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+   CALLER in "never"?
+   ╎list element: never
+   CALLER in "never"? no (end of list)
+  end sublist never_localparts
+ list element: +n1_localparts
+  start sublist n1_localparts
+   CALLER in "never1"?
+   ╎list element: never1
+   CALLER in "never1"? no (end of list)
+  end sublist n1_localparts
+ list element: ! +local_localparts
+  start sublist local_localparts
+   CALLER in "CALLER"?
+   ╎list element: CALLER
+   ╎CALLER in "CALLER"? yes (matched "CALLER")
+  end sublist local_localparts
+ data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
+ CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-cached no match for +never_localparts
-cached lookup data = NULL
-list element: +n2_localparts
- start sublist n2_localparts
-  list element: never2
-  list element: +n1_localparts
-   start sublist n1_localparts
-  cached no match for +n1_localparts
-  cached lookup data = NULL
-  CALLER in "<; never2 ; +n1_localparts"? no (end of list)
- end sublist n2_localparts
-list element: !+local_localparts
- start sublist local_localparts
-cached yes match for +local_localparts
-cached lookup data = CALLER
-CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
+CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+ cached no match for +never_localparts
+ cached lookup data = NULL
+ list element: +n2_localparts
+  start sublist n2_localparts
+   CALLER in "<; never2 ; +n1_localparts"?
+   ╎list element: never2
+   ╎list element: +n1_localparts
+   ╎ start sublist n1_localparts
+   ╎cached no match for +n1_localparts
+   ╎cached lookup data = NULL
+   CALLER in "<; never2 ; +n1_localparts"? no (end of list)
+  end sublist n2_localparts
+ list element: !+local_localparts
+  start sublist local_localparts
+ cached yes match for +local_localparts
+ cached lookup data = CALLER
+ CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +local_localparts
- start sublist local_localparts
-cached yes match for +local_localparts
-cached lookup data = CALLER
-CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
+CALLER in "+local_localparts"?
+ list element: +local_localparts
+  start sublist local_localparts
+ cached yes match for +local_localparts
+ cached lookup data = CALLER
+ CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
@@ -101,22 +92,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -165,10 +140,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1236
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -207,54 +178,61 @@ routing CALLER@test.ex
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-  list element: never
-  CALLER in "never"? no (end of list)
- end sublist never_localparts
-list element: +n1_localparts
- start sublist n1_localparts
-  list element: never1
-  CALLER in "never1"? no (end of list)
- end sublist n1_localparts
-list element: ! +local_localparts
- start sublist local_localparts
-  list element: CALLER
-  CALLER in "CALLER"? yes (matched "CALLER")
- end sublist local_localparts
-data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
-CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
+CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+   CALLER in "never"?
+   ╎list element: never
+   CALLER in "never"? no (end of list)
+  end sublist never_localparts
+ list element: +n1_localparts
+  start sublist n1_localparts
+   CALLER in "never1"?
+   ╎list element: never1
+   CALLER in "never1"? no (end of list)
+  end sublist n1_localparts
+ list element: ! +local_localparts
+  start sublist local_localparts
+   CALLER in "CALLER"?
+   ╎list element: CALLER
+   ╎CALLER in "CALLER"? yes (matched "CALLER")
+  end sublist local_localparts
+ data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
+ CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-cached no match for +never_localparts
-cached lookup data = NULL
-list element: +n2_localparts
- start sublist n2_localparts
-  list element: never2
-  list element: +n1_localparts
-   start sublist n1_localparts
-  cached no match for +n1_localparts
-  cached lookup data = NULL
-  CALLER in "<; never2 ; +n1_localparts"? no (end of list)
- end sublist n2_localparts
-list element: !+local_localparts
- start sublist local_localparts
-cached yes match for +local_localparts
-cached lookup data = CALLER
-CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
+CALLER in "+never_localparts : +n2_localparts : !+local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+ cached no match for +never_localparts
+ cached lookup data = NULL
+ list element: +n2_localparts
+  start sublist n2_localparts
+   CALLER in "<; never2 ; +n1_localparts"?
+   ╎list element: never2
+   ╎list element: +n1_localparts
+   ╎ start sublist n1_localparts
+   ╎cached no match for +n1_localparts
+   ╎cached lookup data = NULL
+   CALLER in "<; never2 ; +n1_localparts"? no (end of list)
+  end sublist n2_localparts
+ list element: !+local_localparts
+  start sublist local_localparts
+ cached yes match for +local_localparts
+ cached lookup data = CALLER
+ CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: +local_localparts
- start sublist local_localparts
-cached yes match for +local_localparts
-cached lookup data = CALLER
-CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
+CALLER in "+local_localparts"?
+ list element: +local_localparts
+  start sublist local_localparts
+ cached yes match for +local_localparts
+ cached lookup data = CALLER
+ CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
 checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
@@ -333,22 +311,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -366,55 +328,63 @@ routing unknown@test.ex
 --------> r1 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-  list element: never
-  unknown in "never"? no (end of list)
- end sublist never_localparts
-list element: +n1_localparts
- start sublist n1_localparts
-  list element: never1
-  unknown in "never1"? no (end of list)
- end sublist n1_localparts
-list element: ! +local_localparts
- start sublist local_localparts
-  list element: CALLER
-  unknown in "CALLER"? no (end of list)
- end sublist local_localparts
+unknown in "+never_localparts : +n1_localparts : ! +local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+   unknown in "never"?
+   ╎list element: never
+   unknown in "never"? no (end of list)
+  end sublist never_localparts
+ list element: +n1_localparts
+  start sublist n1_localparts
+   unknown in "never1"?
+   ╎list element: never1
+   unknown in "never1"? no (end of list)
+  end sublist n1_localparts
+ list element: ! +local_localparts
+  start sublist local_localparts
+   unknown in "CALLER"?
+   ╎list element: CALLER
+   unknown in "CALLER"? no (end of list)
+  end sublist local_localparts
 unknown in "+never_localparts : +n1_localparts : ! +local_localparts"? yes (end of list)
 calling r1 router
 r1 router called for unknown@test.ex
   domain = test.ex
 route_item = never
-list element: never
+test.ex in "never"?
+ list element: never
 test.ex in "never"? no (end of list)
 r1 router declined for unknown@test.ex
 --------> r2 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
-list element: +never_localparts
- start sublist never_localparts
-cached no match for +never_localparts
-cached lookup data = NULL
-list element: +n2_localparts
- start sublist n2_localparts
-  list element: never2
-  list element: +n1_localparts
-   start sublist n1_localparts
-  cached no match for +n1_localparts
-  cached lookup data = NULL
-  unknown in "<; never2 ; +n1_localparts"? no (end of list)
- end sublist n2_localparts
-list element: !+local_localparts
- start sublist local_localparts
-cached no match for +local_localparts
-cached lookup data = NULL
+unknown in "+never_localparts : +n2_localparts : !+local_localparts"?
+ list element: +never_localparts
+  start sublist never_localparts
+ cached no match for +never_localparts
+ cached lookup data = NULL
+ list element: +n2_localparts
+  start sublist n2_localparts
+   unknown in "<; never2 ; +n1_localparts"?
+   ╎list element: never2
+   ╎list element: +n1_localparts
+   ╎ start sublist n1_localparts
+   ╎cached no match for +n1_localparts
+   ╎cached lookup data = NULL
+   unknown in "<; never2 ; +n1_localparts"? no (end of list)
+  end sublist n2_localparts
+ list element: !+local_localparts
+  start sublist local_localparts
+ cached no match for +local_localparts
+ cached lookup data = NULL
 unknown in "+never_localparts : +n2_localparts : !+local_localparts"? yes (end of list)
 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex
-list element: *
-test.ex in "*"? yes (matched "*")
+test.ex in "*"?
+ list element: *
+ test.ex in "*"? yes (matched "*")
 DNS lookup of test.ex (MX) using fakens
 DNS lookup of test.ex (MX) gave NO_DATA
 returning DNS_NODATA
@@ -430,47 +400,53 @@ r2 router declined for unknown@test.ex
 --------> r3 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
-list element: +local_localparts
- start sublist local_localparts
-cached no match for +local_localparts
-cached lookup data = NULL
+unknown in "+local_localparts"?
+ list element: +local_localparts
+  start sublist local_localparts
+ cached no match for +local_localparts
+ cached lookup data = NULL
 unknown in "+local_localparts"? no (end of list)
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
-list element: +local_localparts
- start sublist local_localparts
-cached no match for +local_localparts
-cached lookup data = NULL
-list element: +expanded
- start sublist expanded
-  list element: test.ex
-  unknown in "test.ex"? no (end of list)
- end sublist expanded
-list element: +unexpanded
- start sublist unexpanded
-  list element: unexpanded
-  unknown in "unexpanded"? no (end of list)
- end sublist unexpanded
+unknown in "+local_localparts : +expanded : +unexpanded"?
+ list element: +local_localparts
+  start sublist local_localparts
+ cached no match for +local_localparts
+ cached lookup data = NULL
+ list element: +expanded
+  start sublist expanded
+   unknown in "test.ex"?
+   ╎list element: test.ex
+   unknown in "test.ex"? no (end of list)
+  end sublist expanded
+ list element: +unexpanded
+  start sublist unexpanded
+   unknown in "unexpanded"?
+   ╎list element: unexpanded
+   unknown in "unexpanded"? no (end of list)
+  end sublist unexpanded
 unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list)
 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=unknown domain=test.ex
 checking local_parts
-list element: +local_localparts
- start sublist local_localparts
-cached no match for +local_localparts
-cached lookup data = NULL
-list element: +expanded
- start sublist expanded
-  list element: test.ex
-  unknown in "test.ex"? no (end of list)
- end sublist expanded
-list element: +unexpanded
- start sublist unexpanded
-cached no match for +unexpanded
-cached lookup data = NULL
+unknown in "+local_localparts : +expanded : +unexpanded"?
+ list element: +local_localparts
+  start sublist local_localparts
+ cached no match for +local_localparts
+ cached lookup data = NULL
+ list element: +expanded
+  start sublist expanded
+   unknown in "test.ex"?
+   ╎list element: test.ex
+   unknown in "test.ex"? no (end of list)
+  end sublist expanded
+ list element: +unexpanded
+  start sublist unexpanded
+ cached no match for +unexpanded
+ cached lookup data = NULL
 unknown in "+local_localparts : +expanded : +unexpanded"? no (end of list)
 r5 router skipped: local_parts mismatch
 no more routers
diff --git a/test/stderr/0279 b/test/stderr/0279
index 3ebd24eb1..1885579cb 100644
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -37,58 +21,66 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-list element: user1@+funny_domains
-address match test: subject=CALLER@test.ex pattern=user1@+funny_domains
+CALLER@test.ex in "user1@+funny_domains"?
+ list element: user1@+funny_domains
+ address match test: subject=CALLER@test.ex pattern=user1@+funny_domains
 CALLER@test.ex in "user1@+funny_domains"? no (end of list)
 rr1 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-list element: +never_addresses
- start sublist never_addresses
-  list element: never@test.ex
-  address match test: subject=CALLER@test.ex pattern=never@test.ex
-  CALLER@test.ex in "never@test.ex"? no (end of list)
- end sublist never_addresses
-list element: +n1_addresses
- start sublist n1_addresses
-  list element: never1@test.ex
-  address match test: subject=CALLER@test.ex pattern=never1@test.ex
-  CALLER@test.ex in "never1@test.ex"? no (end of list)
- end sublist n1_addresses
-list element: ! +local_addresses
- start sublist local_addresses
-  list element: CALLER@test.ex
-  address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
-  list element: test.ex
-  test.ex in "test.ex"? yes (matched "test.ex")
-  CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
- end sublist local_addresses
-data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'CALLER@test.ex'
-CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
+CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"?
+ list element: +never_addresses
+  start sublist never_addresses
+   CALLER@test.ex in "never@test.ex"?
+   ╎list element: never@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never@test.ex
+   CALLER@test.ex in "never@test.ex"? no (end of list)
+  end sublist never_addresses
+ list element: +n1_addresses
+  start sublist n1_addresses
+   CALLER@test.ex in "never1@test.ex"?
+   ╎list element: never1@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never1@test.ex
+   CALLER@test.ex in "never1@test.ex"? no (end of list)
+  end sublist n1_addresses
+ list element: ! +local_addresses
+  start sublist local_addresses
+   CALLER@test.ex in "CALLER@test.ex"?
+   ╎list element: CALLER@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
+   ╎test.ex in "test.ex"?
+   ╎ list element: test.ex
+   ╎ test.ex in "test.ex"? yes (matched "test.ex")
+   ╎CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
+  end sublist local_addresses
+ data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'CALLER@test.ex'
+ CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
 r1 router skipped: senders mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-list element: +never_addresses
- start sublist never_addresses
-cached no match for +never_addresses
-cached lookup data = NULL
-list element: +n2_addresses
- start sublist n2_addresses
-  list element: never2@test.ex
-  address match test: subject=CALLER@test.ex pattern=never2@test.ex
-  list element: +n1_addresses
-   start sublist n1_addresses
-  cached no match for +n1_addresses
-  cached lookup data = NULL
-  CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
- end sublist n2_addresses
-list element: !+local_addresses
- start sublist local_addresses
-cached yes match for +local_addresses
-cached lookup data = CALLER@test.ex
-CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
+CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"?
+ list element: +never_addresses
+  start sublist never_addresses
+ cached no match for +never_addresses
+ cached lookup data = NULL
+ list element: +n2_addresses
+  start sublist n2_addresses
+   CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"?
+   ╎list element: never2@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never2@test.ex
+   ╎list element: +n1_addresses
+   ╎ start sublist n1_addresses
+   ╎cached no match for +n1_addresses
+   ╎cached lookup data = NULL
+   CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
+  end sublist n2_addresses
+ list element: !+local_addresses
+  start sublist local_addresses
+ cached yes match for +local_addresses
+ cached lookup data = CALLER@test.ex
+ CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
 r2 router skipped: senders mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
@@ -96,11 +88,12 @@ checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders
-list element: +local_addresses
- start sublist local_addresses
-cached yes match for +local_addresses
-cached lookup data = CALLER@test.ex
-CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
+CALLER@test.ex in "+local_addresses"?
+ list element: +local_addresses
+  start sublist local_addresses
+ cached yes match for +local_addresses
+ cached lookup data = CALLER@test.ex
+ CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
 calling r3 router
 r3 router called for CALLER@test.ex
   domain = test.ex
@@ -119,22 +112,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -153,15 +130,18 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
-list element: user1@+funny_domains
-address match test: subject=user1@fun.1 pattern=user1@+funny_domains
-list element: +funny_domains
- start sublist funny_domains
-  list element: fun.1
-  fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
- end sublist funny_domains
-fun.1 in "+funny_domains"? yes (matched "+funny_domains")
-user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
+user1@fun.1 in "user1@+funny_domains"?
+ list element: user1@+funny_domains
+ address match test: subject=user1@fun.1 pattern=user1@+funny_domains
+ fun.1 in "+funny_domains"?
+  list element: +funny_domains
+   start sublist funny_domains
+   ╎fun.1 in "fun.1 : fun.2"?
+   ╎ list element: fun.1
+   ╎ fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
+   end sublist funny_domains
+  fun.1 in "+funny_domains"? yes (matched "+funny_domains")
+ user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
 calling rr1 router
 rda_interpret (string): ':fail: matched *@+funny_domains'
 expanded: ':fail: matched *@+funny_domains'
diff --git a/test/stderr/0281 b/test/stderr/0281
index d27390092..f9e369178 100644
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -6,16 +6,19 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_rcpt_1"
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
->>> list element: @
->>> myhost.test.ex in "@ : @[]"? yes (matched "@")
+>>> myhost.test.ex in "@ : @[]"?
+>>>  list element: @
+>>>  myhost.test.ex in "@ : @[]"? yes (matched "@")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
@@ -24,9 +27,10 @@
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
->>> list element: @
->>> list element: @[]
->>> [127.0.0.1] in "@ : @[]"? yes (matched "@[]")
+>>> [127.0.0.1] in "@ : @[]"?
+>>>  list element: @
+>>>  list element: @[]
+>>>  [127.0.0.1] in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
@@ -35,8 +39,9 @@
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]
 >>> check domains = @ : @[]
->>> list element: @
->>> list element: @[]
+>>> else.where in "@ : @[]"?
+>>>  list element: @
+>>>  list element: @[]
 >>> else.where in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_1"
 >>> end of ACL "acl_rcpt_1": not OK
@@ -45,11 +50,13 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
->>> list element: other1.test.ex
->>> other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
+>>> mxt13.test.ex in "@mx_any"?
+>>>  list element: @mx_any
+>>>  other1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>   other1.test.ex in hosts_treat_as_local? yes (matched "other1.test.ex")
 >>> local host has lowest MX
->>> mxt13.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt13.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL "acl_rcpt_2"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
@@ -58,11 +65,13 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt1.test.ex in "@mx_any"?
+>>>  list element: @mx_any
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
->>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL "acl_rcpt_2"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
@@ -71,15 +80,18 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt6.test.ex in "@mx_any"?
+>>>  list element: @mx_any
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>>   ten-2.test.ex V4NET.0.0.2 6
->>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL "acl_rcpt_2"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
@@ -88,13 +100,17 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt9.test.ex in "@mx_any"?
+>>>  list element: @mx_any
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-2.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-2.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-3.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK
@@ -103,7 +119,8 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
+>>> mxnone.test.ex in "@mx_any"?
+>>>  list element: @mx_any
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK
@@ -112,13 +129,16 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doe
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
->>> list element: @mx_primary
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt5.test.ex in "@mx_primary"?
+>>>  list element: @mx_primary
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
->>> mxt5.test.ex in "@mx_primary"? yes (matched "@mx_primary")
+>>>  mxt5.test.ex in "@mx_primary"? yes (matched "@mx_primary")
 >>> require: condition test succeeded in ACL "acl_rcpt_3"
 >>> processing "accept" (TESTSUITE/test-config 31)
 >>> accept: condition test succeeded in ACL "acl_rcpt_3"
@@ -127,13 +147,17 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doe
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
->>> list element: @mx_primary
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt6.test.ex in "@mx_primary"?
+>>>  list element: @mx_primary
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-2.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-2.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
@@ -145,13 +169,17 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
->>> list element: @mx_primary
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt9.test.ex in "@mx_primary"?
+>>>  list element: @mx_primary
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-2.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-2.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-3.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
@@ -160,7 +188,8 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
->>> list element: @mx_primary
+>>> mxnone.test.ex in "@mx_primary"?
+>>>  list element: @mx_primary
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
@@ -169,9 +198,11 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doe
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
->>> list element: @mx_secondary
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt5.test.ex in "@mx_secondary"?
+>>>  list element: @mx_secondary
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host has lowest MX
 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
@@ -181,17 +212,21 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
->>> list element: @mx_secondary
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt6.test.ex in "@mx_secondary"?
+>>>  list element: @mx_secondary
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-2.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-2.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
->>> mxt6.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
+>>>  mxt6.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL "acl_rcpt_4"
 >>> processing "accept" (TESTSUITE/test-config 36)
 >>> accept: condition test succeeded in ACL "acl_rcpt_4"
@@ -200,13 +235,17 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
->>> list element: @mx_secondary
->>> list element: other1.test.ex
->>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-2.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> ten-3.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt9.test.ex in "@mx_secondary"?
+>>>  list element: @mx_secondary
+>>>  ten-1.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-1.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-2.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-2.test.ex in hosts_treat_as_local? no (end of list)
+>>>  ten-3.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  ten-3.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt9.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK
@@ -215,7 +254,8 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
->>> list element: @mx_secondary
+>>> mxnone.test.ex in "@mx_secondary"?
+>>>  list element: @mx_secondary
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK
@@ -224,11 +264,12 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doe
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
->>> list element: @
+>>> host in "@ : @[]"?
+>>>  list element: @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> list element: @[]
+>>>  list element: @[]
 >>> host in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_5"
 >>> end of ACL "acl_rcpt_5": not OK
@@ -241,19 +282,22 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
->>> list element: @
+>>> host in "@ : @[]"?
+>>>  list element: @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> host in "@ : @[]"? yes (matched "@")
+>>>  host in "@ : @[]"? yes (matched "@")
 >>> require: condition test succeeded in ACL "acl_rcpt_5"
 >>> processing "accept" (TESTSUITE/test-config 41)
 >>> accept: condition test succeeded in ACL "acl_rcpt_5"
@@ -266,20 +310,23 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> check hosts = @ : @[]
->>> list element: @
+>>> host in "@ : @[]"?
+>>>  list element: @
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=myhost.test.ex address=V4NET.10.10.10
->>> list element: @[]
->>> host in "@ : @[]"? yes (matched "@[]")
+>>>  list element: @[]
+>>>  host in "@ : @[]"? yes (matched "@[]")
 >>> require: condition test succeeded in ACL "acl_rcpt_5"
 >>> processing "accept" (TESTSUITE/test-config 41)
 >>> accept: condition test succeeded in ACL "acl_rcpt_5"
@@ -292,22 +339,27 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> check domains = @mx_any
->>> list element: @mx_any
->>> list element: other1.test.ex
->>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt3.test.ex in "@mx_any"?
+>>>  list element: @mx_any
+>>>  not-exist.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  not-exist.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
->>> mxt3.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt3.test.ex in "@mx_any"? yes (matched "@mx_any")
 >>> require: condition test succeeded in ACL "acl_rcpt_2"
 >>> processing "accept" (TESTSUITE/test-config 26)
 >>> accept: condition test succeeded in ACL "acl_rcpt_2"
@@ -316,11 +368,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> check domains = @mx_primary
->>> list element: @mx_primary
->>> list element: other1.test.ex
->>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt3.test.ex in "@mx_primary"?
+>>>  list element: @mx_primary
+>>>  not-exist.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  not-exist.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
@@ -331,14 +386,17 @@ LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> check domains = @mx_secondary
->>> list element: @mx_secondary
->>> list element: other1.test.ex
->>> not-exist.test.ex in hosts_treat_as_local? no (end of list)
->>> list element: other1.test.ex
->>> eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
+>>> mxt3.test.ex in "@mx_secondary"?
+>>>  list element: @mx_secondary
+>>>  not-exist.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  not-exist.test.ex in hosts_treat_as_local? no (end of list)
+>>>  eximtesthost.test.ex in hosts_treat_as_local?
+>>>   list element: other1.test.ex
+>>>  eximtesthost.test.ex in hosts_treat_as_local? no (end of list)
 >>> local host in host list - removed hosts:
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
->>> mxt3.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
+>>>  mxt3.test.ex in "@mx_secondary"? yes (matched "@mx_secondary")
 >>> require: condition test succeeded in ACL "acl_rcpt_4"
 >>> processing "accept" (TESTSUITE/test-config 36)
 >>> accept: condition test succeeded in ACL "acl_rcpt_4"
diff --git a/test/stderr/0294 b/test/stderr/0294
index 22c043df8..9b3290d72 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -96,22 +96,6 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -127,12 +111,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]
 SMTP<< mail from:<x@y>
@@ -142,7 +128,8 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
 processing "deny" (TESTSUITE/test-config 35)
 check local_parts = reject
-list element: reject
+one in "reject"?
+ list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
 processing "accept" (TESTSUITE/test-config 35)
@@ -150,12 +137,14 @@ accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
-list element: 
-list element: V4NET.9.8.7
+host in smtp_ratelimit_hosts?
+ list element: 
+ list element: V4NET.9.8.7
 host in smtp_ratelimit_hosts? no (end of list)
 processing "deny" (TESTSUITE/test-config 35)
 check local_parts = reject
-list element: reject
+one in "reject"?
+ list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
 processing "accept" (TESTSUITE/test-config 35)
@@ -168,22 +157,6 @@ LOG: smtp_connection MAIN
   SMTP connection from (test) [1.2.3.4] closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -199,12 +172,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]
 SMTP<< mail from:<x@y>
@@ -214,7 +189,8 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
 processing "deny" (TESTSUITE/test-config 35)
 check local_parts = reject
-list element: reject
+one in "reject"?
+ list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
 processing "accept" (TESTSUITE/test-config 35)
@@ -222,13 +198,15 @@ accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
-list element: 
-list element: V4NET.9.8.7
-host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
+host in smtp_ratelimit_hosts?
+ list element: 
+ list element: V4NET.9.8.7
+  host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
 rate limit RCPT: delay 0.25 sec
 processing "deny" (TESTSUITE/test-config 35)
 check local_parts = reject
-list element: reject
+one in "reject"?
+ list element: reject
 one in "reject"? no (end of list)
 deny: condition test failed in inline ACL
 processing "accept" (TESTSUITE/test-config 35)
diff --git a/test/stderr/0303 b/test/stderr/0303
index 2f3ec68a3..da8ceff5c 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> myhost.test.ex in helo_lookup_domains? yes (matched "@")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> myhost.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
@@ -21,18 +23,25 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
->>> [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [127.0.0.1] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>>  [127.0.0.1] in helo_lookup_domains? yes (matched "@[]")
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -41,31 +50,17 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhubarb.custard in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhubarb.custard in helo_lookup_domains? no (end of list)
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -86,20 +81,27 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< EHLO [V4NET.2.3.4]
-list element: @
-list element: @[]
+[V4NET.2.3.4] in helo_lookup_domains?
+ list element: @
+ list element: @[]
 [V4NET.2.3.4] in helo_lookup_domains? no (end of list)
 sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4]
 sender_rcvhost = [V4NET.2.3.4]
 set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4]
+host in limits_advertise_hosts?
+ list element: !*
 host in dsn_advertise_hosts? no (option unset)
-list element: *
-host in pipelining_advertise_hosts? yes (matched "*")
+host in pipelining_advertise_hosts?
+ list element: *
+  host in pipelining_advertise_hosts? yes (matched "*")
+host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
+host in tls_advertise_hosts?
 SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
        250-SIZE 52428800
        250-8BITMIME
@@ -148,22 +150,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -184,17 +170,23 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< EHLO [V4NET.2.3.4]
 sender_fullhost = host.name.tld [V4NET.2.3.4]
 sender_rcvhost = host.name.tld ([V4NET.2.3.4])
 set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4]
+host in limits_advertise_hosts?
+ list element: !*
 host in dsn_advertise_hosts? no (option unset)
-list element: *
-host in pipelining_advertise_hosts? yes (matched "*")
+host in pipelining_advertise_hosts?
+ list element: *
+  host in pipelining_advertise_hosts? yes (matched "*")
+host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
+host in tls_advertise_hosts?
 SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
        250-SIZE 52428800
        250-8BITMIME
diff --git a/test/stderr/0304 b/test/stderr/0304
index 2f3e0ebac..159c875a1 100644
--- a/test/stderr/0304
+++ b/test/stderr/0304
@@ -6,64 +6,77 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> b1@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b1@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b1@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> x in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> x in "*.domain2.only"? no (end of list)
+>>> b1@x in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  x in "domain.only"?
+>>>   list element: domain.only
+>>>  x in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  x in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  x in "*.domain2.only"? no (end of list)
 >>> b1@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> b1@x in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> b1@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> b1@x in "pqr@@"?
+>>>  list element: pqr@@
 >>> b1@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>>  in ":"? yes (matched "")
+>>>  in ":"?
+>>>  list element: 
+>>>   in ":"? yes (matched "")
 >>> check recipients = b1@x
->>> list element: b1@x
->>> list element: x
->>> x in "x"? yes (matched "x")
->>> b1@x in "b1@x"? yes (matched "b1@x")
+>>> b1@x in "b1@x"?
+>>>  list element: b1@x
+>>>  x in "x"?
+>>>   list element: x
+>>>   x in "x"? yes (matched "x")
+>>>  b1@x in "b1@x"? yes (matched "b1@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
@@ -71,65 +84,78 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> b2@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b2@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b2@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> x in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> x in "*.domain2.only"? no (end of list)
+>>> b2@x in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  x in "domain.only"?
+>>>   list element: domain.only
+>>>  x in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  x in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  x in "*.domain2.only"? no (end of list)
 >>> b2@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> b2@x in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> b2@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> b2@x in "pqr@@"?
+>>>  list element: pqr@@
 >>> b2@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>>  in ":"? yes (matched "")
+>>>  in ":"?
+>>>  list element: 
+>>>   in ":"? yes (matched "")
 >>> check recipients = b1@x
->>> list element: b1@x
+>>> b2@x in "b1@x"?
+>>>  list element: b1@x
 >>> b2@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
->>>  in "^$"? yes (matched "^$")
+>>>  in "^$"?
+>>>  list element: ^$
+>>>   in "^$"? yes (matched "^$")
 >>> check recipients = b2@x
->>> list element: b2@x
->>> list element: x
->>> x in "x"? yes (matched "x")
->>> b2@x in "b2@x"? yes (matched "b2@x")
+>>> b2@x in "b2@x"?
+>>>  list element: b2@x
+>>>  x in "x"?
+>>>   list element: x
+>>>   x in "x"? yes (matched "x")
+>>>  b2@x in "b2@x"? yes (matched "b2@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
@@ -137,82 +163,98 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> b9@x in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> b9@x in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> x in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> x in "*.domain2.only"? no (end of list)
+>>> b9@x in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  x in "domain.only"?
+>>>   list element: domain.only
+>>>  x in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  x in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  x in "*.domain2.only"? no (end of list)
 >>> b9@x in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> b9@x in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> b9@x in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> b9@x in "pqr@@"?
+>>>  list element: pqr@@
 >>> b9@x in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>>  in ":"? yes (matched "")
+>>>  in ":"?
+>>>  list element: 
+>>>   in ":"? yes (matched "")
 >>> check recipients = b1@x
->>> list element: b1@x
+>>> b9@x in "b1@x"?
+>>>  list element: b1@x
 >>> b9@x in "b1@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
->>>  in "^$"? yes (matched "^$")
+>>>  in "^$"?
+>>>  list element: ^$
+>>>   in "^$"? yes (matched "^$")
 >>> check recipients = b2@x
->>> list element: b2@x
+>>> b9@x in "b2@x"?
+>>>  list element: b2@x
 >>> b9@x in "b2@x"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> x in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  x in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  x in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> b9@x in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> b9@x in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> b9@x in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -222,8 +264,9 @@ LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
+>>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
@@ -231,8 +274,9 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
+>>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
@@ -240,11 +284,13 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
->>> list element: b
->>> b in "b"? yes (matched "b")
->>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
+>>> a@b in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
+>>>  b in "b"?
+>>>   list element: b
+>>>   b in "b"? yes (matched "b")
+>>>  a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
@@ -252,77 +298,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> ok@ok in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@ok in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> ok in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> ok in "*.domain2.only"? no (end of list)
+>>> ok@ok in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  ok in "domain.only"?
+>>>   list element: domain.only
+>>>  ok in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  ok in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  ok in "*.domain2.only"? no (end of list)
 >>> ok@ok in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> ok@ok in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> ok@ok in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> ok@ok in "pqr@@"?
+>>>  list element: pqr@@
 >>> ok@ok in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  ok in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@ok in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@ok in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@ok in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -332,15 +393,17 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@a.b.c in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
+>>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>>  x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
@@ -348,15 +411,17 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abc@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
+>>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>>  abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
@@ -364,77 +429,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@d.e.f in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@d.e.f in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> d.e.f in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> d.e.f in "*.domain2.only"? no (end of list)
+>>> x@d.e.f in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  d.e.f in "domain.only"?
+>>>   list element: domain.only
+>>>  d.e.f in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  d.e.f in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  d.e.f in "*.domain2.only"? no (end of list)
 >>> x@d.e.f in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> x@d.e.f in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> x@d.e.f in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> x@d.e.f in "pqr@@"?
+>>>  list element: pqr@@
 >>> x@d.e.f in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  d.e.f in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@d.e.f in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@d.e.f in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -444,21 +524,24 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abc@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
+>>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>>  abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
@@ -466,21 +549,24 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> xyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
+>>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>>  xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
@@ -488,21 +574,24 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abcxyz@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abcxyz@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
+>>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>>  abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
@@ -510,77 +599,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> ok@at.1 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> ok@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> at.1 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> at.1 in "*.domain2.only"? no (end of list)
+>>> ok@at.1 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  at.1 in "domain.only"?
+>>>   list element: domain.only
+>>>  at.1 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  at.1 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  at.1 in "*.domain2.only"? no (end of list)
 >>> ok@at.1 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> ok@at.1 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> ok@at.1 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> ok@at.1 in "pqr@@"?
+>>>  list element: pqr@@
 >>> ok@at.1 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  at.1 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> ok@at.1 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> ok@at.1 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> ok@at.1 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -590,29 +694,34 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@domain.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain.only in "domain.only"? yes (matched "domain.only")
->>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
+>>> x@domain.only in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain.only in "domain.only"?
+>>>   list element: domain.only
+>>>   domain.only in "domain.only"? yes (matched "domain.only")
+>>>  x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
@@ -620,32 +729,38 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@abc.domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@abc.domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@abc.domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> abc.domain2.only in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> abc.domain2.only in "*.domain2.only"? yes (matched "*.domain2.only")
->>> x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
+>>> x@abc.domain2.only in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  abc.domain2.only in "domain.only"?
+>>>   list element: domain.only
+>>>  abc.domain2.only in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  abc.domain2.only in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>   abc.domain2.only in "*.domain2.only"? yes (matched "*.domain2.only")
+>>>  x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
@@ -653,77 +768,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@domain2.only in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain2.only in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain2.only in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain2.only in "*.domain2.only"? no (end of list)
+>>> x@domain2.only in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain2.only in "domain.only"?
+>>>   list element: domain.only
+>>>  domain2.only in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain2.only in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain2.only in "*.domain2.only"? no (end of list)
 >>> x@domain2.only in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> x@domain2.only in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> x@domain2.only in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> x@domain2.only in "pqr@@"?
+>>>  list element: pqr@@
 >>> x@domain2.only in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain2.only in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain2.only in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain2.only in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> x@domain2.only in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -733,40 +863,48 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abc@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain3 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain3 in "*.domain2.only"? no (end of list)
+>>> abc@domain3 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain3 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain3 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain3 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain3 in "*.domain2.only"? no (end of list)
 >>> abc@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: domain3
->>> domain3 in "domain3"? yes (matched "domain3")
->>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
+>>> abc@domain3 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  domain3 in "domain3"?
+>>>   list element: domain3
+>>>   domain3 in "domain3"? yes (matched "domain3")
+>>>  abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
@@ -774,41 +912,49 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> xyz@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> x.domain4 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> x.domain4 in "*.domain2.only"? no (end of list)
+>>> xyz@x.domain4 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  x.domain4 in "domain.only"?
+>>>   list element: domain.only
+>>>  x.domain4 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  x.domain4 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  x.domain4 in "*.domain2.only"? no (end of list)
 >>> xyz@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
->>> list element: *.domain4
->>> x.domain4 in "*.domain4"? yes (matched "*.domain4")
->>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
+>>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
+>>>  x.domain4 in "*.domain4"?
+>>>   list element: *.domain4
+>>>   x.domain4 in "*.domain4"? yes (matched "*.domain4")
+>>>  xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
@@ -816,79 +962,95 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abc@x.domain4 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@x.domain4 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> x.domain4 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> x.domain4 in "*.domain2.only"? no (end of list)
+>>> abc@x.domain4 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  x.domain4 in "domain.only"?
+>>>   list element: domain.only
+>>>  x.domain4 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  x.domain4 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  x.domain4 in "*.domain2.only"? no (end of list)
 >>> abc@x.domain4 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: domain3
->>> x.domain4 in "domain3"? no (end of list)
->>> list element: xyz@*.domain4
+>>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  x.domain4 in "domain3"?
+>>>   list element: domain3
+>>>  x.domain4 in "domain3"? no (end of list)
+>>>  list element: xyz@*.domain4
 >>> abc@x.domain4 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> abc@x.domain4 in "pqr@@"?
+>>>  list element: pqr@@
 >>> abc@x.domain4 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  x.domain4 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@x.domain4 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@x.domain4 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@x.domain4 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -898,81 +1060,98 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> xyz@domain3 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain3 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain3 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain3 in "*.domain2.only"? no (end of list)
+>>> xyz@domain3 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain3 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain3 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain3 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain3 in "*.domain2.only"? no (end of list)
 >>> xyz@domain3 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
->>> list element: *.domain4
->>> domain3 in "*.domain4"? no (end of list)
+>>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
+>>>  domain3 in "*.domain4"?
+>>>   list element: *.domain4
+>>>  domain3 in "*.domain4"? no (end of list)
 >>> xyz@domain3 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> xyz@domain3 in "pqr@@"?
+>>>  list element: pqr@@
 >>> xyz@domain3 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain3 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d4
->>> domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
+>>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d4
+>>>  domain3 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> xyz@domain3 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xyz@domain3 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -982,47 +1161,56 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> pqr@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> pqr@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> pqr@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> myhost.test.ex in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> myhost.test.ex in "*.domain2.only"? no (end of list)
+>>> pqr@myhost.test.ex in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  myhost.test.ex in "domain.only"?
+>>>   list element: domain.only
+>>>  myhost.test.ex in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  myhost.test.ex in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> pqr@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> pqr@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
->>> list element: @
->>> myhost.test.ex in "@"? yes (matched "@")
->>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
+>>> pqr@myhost.test.ex in "pqr@@"?
+>>>  list element: pqr@@
+>>>  myhost.test.ex in "@"?
+>>>   list element: @
+>>>   myhost.test.ex in "@"? yes (matched "@")
+>>>  pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
@@ -1030,77 +1218,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> xxx@myhost.test.ex in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xxx@myhost.test.ex in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> myhost.test.ex in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> myhost.test.ex in "*.domain2.only"? no (end of list)
+>>> xxx@myhost.test.ex in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  myhost.test.ex in "domain.only"?
+>>>   list element: domain.only
+>>>  myhost.test.ex in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  myhost.test.ex in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  myhost.test.ex in "*.domain2.only"? no (end of list)
 >>> xxx@myhost.test.ex in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> xxx@myhost.test.ex in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> xxx@myhost.test.ex in "pqr@@"?
+>>>  list element: pqr@@
 >>> xxx@myhost.test.ex in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  myhost.test.ex in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xxx@myhost.test.ex in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> xxx@myhost.test.ex in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> xxx@myhost.test.ex in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -1110,68 +1313,82 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
->>> list element: b
->>> domain5 in "b"? no (end of list)
+>>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
+>>>  domain5 in "b"?
+>>>   list element: b
+>>>  domain5 in "b"? no (end of list)
 >>> a@domain5 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> a@domain5 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> a@domain5 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain5 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain5 in "*.domain2.only"? no (end of list)
+>>> a@domain5 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain5 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain5 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain5 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain5 in "*.domain2.only"? no (end of list)
 >>> a@domain5 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> a@domain5 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> a@domain5 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> a@domain5 in "pqr@@"?
+>>>  list element: pqr@@
 >>> a@domain5 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d3")
->>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
+>>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>   domain5 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d3")
+>>>  a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
@@ -1179,76 +1396,92 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> xyz@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> xyz@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> xyz@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain6 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain6 in "*.domain2.only"? no (end of list)
+>>> xyz@domain6 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain6 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain6 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain6 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain6 in "*.domain2.only"? no (end of list)
 >>> xyz@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
->>> list element: *.domain4
->>> domain6 in "*.domain4"? no (end of list)
+>>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
+>>>  domain6 in "*.domain4"?
+>>>   list element: *.domain4
+>>>  domain6 in "*.domain4"? no (end of list)
 >>> xyz@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> xyz@domain6 in "pqr@@"?
+>>>  list element: pqr@@
 >>> xyz@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> xyz@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d4
->>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d4")
->>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
+>>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d4
+>>>   domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "lsearch;TESTSUITE/aux-fixed/0304.d4")
+>>>  xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
@@ -1256,79 +1489,95 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> abc@domain6 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> abc@domain6 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain6 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain6 in "*.domain2.only"? no (end of list)
+>>> abc@domain6 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain6 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain6 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain6 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain6 in "*.domain2.only"? no (end of list)
 >>> abc@domain6 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: domain3
->>> domain6 in "domain3"? no (end of list)
->>> list element: xyz@*.domain4
+>>> abc@domain6 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  domain6 in "domain3"?
+>>>   list element: domain3
+>>>  domain6 in "domain3"? no (end of list)
+>>>  list element: xyz@*.domain4
 >>> abc@domain6 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> abc@domain6 in "pqr@@"?
+>>>  list element: pqr@@
 >>> abc@domain6 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain6 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> abc@domain6 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> abc@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
 >>> abc@domain6 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 51)
@@ -1338,78 +1587,93 @@ LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> check recipients = \N^abc.*@.*\.x\.y\.z\N : a@b
->>> list element: ^abc.*@.*\.x\.y\.z
->>> list element: a@b
+>>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"?
+>>>  list element: ^abc.*@.*\.x\.y\.z
+>>>  list element: a@b
 >>> x@domain7 in "^abc.*@.*\.x\.y\.z : a@b"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>>   message: failed 2
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d1
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
+>>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d1
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 22)
 >>>   message: failed 3
 >>> check recipients = @@lsearch;TESTSUITE/aux-fixed/0304.d2
->>> list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
+>>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"?
+>>>  list element: @@lsearch;TESTSUITE/aux-fixed/0304.d2
 >>> x@domain7 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: failed 4
 >>> check recipients = domain.only : *.domain2.only
->>> list element: domain.only
->>> list element: domain.only
->>> domain7 in "domain.only"? no (end of list)
->>> list element: *.domain2.only
->>> list element: *.domain2.only
->>> domain7 in "*.domain2.only"? no (end of list)
+>>> x@domain7 in "domain.only : *.domain2.only"?
+>>>  list element: domain.only
+>>>  domain7 in "domain.only"?
+>>>   list element: domain.only
+>>>  domain7 in "domain.only"? no (end of list)
+>>>  list element: *.domain2.only
+>>>  domain7 in "*.domain2.only"?
+>>>   list element: *.domain2.only
+>>>  domain7 in "*.domain2.only"? no (end of list)
 >>> x@domain7 in "domain.only : *.domain2.only"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: failed 5
 >>> check recipients = abc@domain3 : xyz@*.domain4
->>> list element: abc@domain3
->>> list element: xyz@*.domain4
+>>> x@domain7 in "abc@domain3 : xyz@*.domain4"?
+>>>  list element: abc@domain3
+>>>  list element: xyz@*.domain4
 >>> x@domain7 in "abc@domain3 : xyz@*.domain4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: failed 6
 >>> check recipients = pqr@@
->>> list element: pqr@@
+>>> x@domain7 in "pqr@@"?
+>>>  list element: pqr@@
 >>> x@domain7 in "pqr@@"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 34)
 >>>   message: failed 7
 >>> check senders = :
->>> list element: 
->>> y in ""? no (end of list)
+>>> x@y in ":"?
+>>>  list element: 
+>>>  y in ""?
+>>>  y in ""? no (end of list)
 >>> x@y in ":"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 38)
 >>>   message: failed 8
 >>> check senders = ^\$
->>> list element: ^$
+>>> x@y in "^$"?
+>>>  list element: ^$
 >>> x@y in "^$"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 42)
 >>>   message: failed 9
 >>> check recipients = *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
->>> list element: lsearch;TESTSUITE/aux-fixed/0304.d3
->>> domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
+>>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>  list element: *@lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0304.d3
+>>>  domain7 in "lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> x@domain7 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 45)
 >>>   message: failed 10
 >>> check recipients = xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
->>> list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
+>>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"?
+>>>  list element: xyz@lsearch;TESTSUITE/aux-fixed/0304.d4
 >>> x@domain7 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? no (end of list)
 >>> deny: condition test failed in ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 48)
 >>>   message: failed 11
 >>> check recipients = lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
->>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
+>>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"?
+>>>  list element: lsearch*@;TESTSUITE/aux-fixed/0304.d5
+>>>  x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11
diff --git a/test/stderr/0305 b/test/stderr/0305
index 5e67667f3..1fc1cf15c 100644
--- a/test/stderr/0305
+++ b/test/stderr/0305
@@ -6,24 +6,30 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains
->>> list element: +ok_domains
->>> list element: ten-1.test.ex
->>> ten-1.test.ex in "ten-1.test.ex"? yes (matched "ten-1.test.ex")
->>> ten-1.test.ex in "+ok_domains"? yes (matched "+ok_domains")
+>>> ten-1.test.ex in "+ok_domains"?
+>>>  list element: +ok_domains
+>>>  ten-1.test.ex in "ten-1.test.ex"?
+>>>   list element: ten-1.test.ex
+>>>   ten-1.test.ex in "ten-1.test.ex"? yes (matched "ten-1.test.ex")
+>>>  ten-1.test.ex in "+ok_domains"? yes (matched "+ok_domains")
 >>> accept: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": ACCEPT
 >>> using ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains
->>> list element: +ok_domains
->>> junk.junk in ""? no (end of list)
+>>> junk.junk in "+ok_domains"?
+>>>  list element: +ok_domains
+>>>  junk.junk in ""?
+>>>  junk.junk in ""? no (end of list)
 >>> junk.junk in "+ok_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl1"
 >>> end of ACL "acl1": implicit DENY
diff --git a/test/stderr/0306 b/test/stderr/0306
index 527137c6e..26850055f 100644
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,27 +6,34 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1-request@lists.test.ex
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
 >>> calling r1 router
 >>> routed by r1 router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing manager-list1@test.ex
->>> list element: lists.test.ex
+>>> test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
 >>> test.ex in "lists.test.ex"? no (end of list)
->>> list element: lists.test.ex
+>>> test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
 >>> test.ex in "lists.test.ex"? no (end of list)
->>> list element: 
->>> anywhere in ""? no (end of list)
+>>> anyone@anywhere in ":"?
+>>>  list element: 
+>>>  anywhere in ""?
+>>>  anywhere in ""? no (end of list)
 >>> anyone@anywhere in ":"? no (end of list)
 >>> calling r5 router
 >>> routed by r5 router
@@ -38,28 +45,34 @@
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> list element: lsearch;TESTSUITE/aux-fixed/0306/list1
->>> sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
+>>>  sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
 >>> calling r2 router
 >>> routed by r2 router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": ACCEPT
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> list element: lsearch;TESTSUITE/aux-fixed/0306/list1
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> anyone@anywhere in "lsearch;TESTSUITE/aux-fixed/0306/list1"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
 >>> anyone@anywhere in "lsearch;TESTSUITE/aux-fixed/0306/list1"? no (end of list)
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
@@ -71,16 +84,20 @@ LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>:
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing nonlist@lists.test.ex
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> list element: *
->>> list element: *
->>> anywhere in "*"? yes (matched "*")
->>> anyone@anywhere in "*"? yes (matched "*")
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> anyone@anywhere in "*"?
+>>>  list element: *
+>>>  anywhere in "*"?
+>>>   list element: *
+>>>   anywhere in "*"? yes (matched "*")
+>>>  anyone@anywhere in "*"? yes (matched "*")
 >>> calling r2 router
 >>> r2 router declined for nonlist@lists.test.ex
->>> list element: lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in "lists.test.ex"?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
diff --git a/test/stderr/0308 b/test/stderr/0308
index 072f7ffde..7745e4913 100644
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -6,25 +6,29 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
->>> list element: *.test.ex
+>>> host in "*.test.ex"?
+>>>  list element: *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
->>> host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
->>> accept: condition test failed in ACL "acl_V4NET_0_0"
->>> processing "accept" (TESTSUITE/test-config 18)
->>> check hosts = V4NET.0.0.97
->>> list element: V4NET.0.0.97
->>> host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
->>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
->>> end of ACL "acl_V4NET_0_0": ACCEPT
+>>>  host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
+>>>  accept: condition test failed in ACL "acl_V4NET_0_0"
+>>>  processing "accept" (TESTSUITE/test-config 18)
+>>>  check hosts = V4NET.0.0.97
+>>>  host in "V4NET.0.0.97"?
+>>>   list element: V4NET.0.0.97
+>>>   host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
+>>>  accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>>  end of ACL "acl_V4NET_0_0": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -33,19 +37,22 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
->>> list element: *.test.ex
+>>> host in "*.test.ex"?
+>>>  list element: *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
->>> host in "*.test.ex"? yes (matched "*.test.ex")
+>>>  host in "*.test.ex"? yes (matched "*.test.ex")
 >>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
 >>> end of ACL "acl_V4NET_0_0": ACCEPT
diff --git a/test/stderr/0312 b/test/stderr/0312
index 1e7af37bc..bd3338944 100644
--- a/test/stderr/0312
+++ b/test/stderr/0312
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 16)
diff --git a/test/stderr/0325 b/test/stderr/0325
index bce40924c..c99c051e4 100644
--- a/test/stderr/0325
+++ b/test/stderr/0325
@@ -14,32 +14,40 @@ r4: $local_part_data = LOCAL PART DATA
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "a1"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +test_domains
->>> list element: +test_domains
->>> list element: lsearch; TESTSUITE/aux-fixed/0325.data
->>> a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch; TESTSUITE/aux-fixed/0325.data")
->>> a.b.c in "+test_domains"? yes (matched "+test_domains")
+>>> a.b.c in "+test_domains"?
+>>>  list element: +test_domains
+>>>  a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"?
+>>>   list element: lsearch; TESTSUITE/aux-fixed/0325.data
+>>>   a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch; TESTSUITE/aux-fixed/0325.data")
+>>>  a.b.c in "+test_domains"? yes (matched "+test_domains")
 >>> check local_parts = +test_local_parts
->>> list element: +test_local_parts
->>> list element: lsearch;TESTSUITE/aux-fixed/0325.data
->>> xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0325.data")
->>> xxx in "+test_local_parts"? yes (matched "+test_local_parts")
+>>> xxx in "+test_local_parts"?
+>>>  list element: +test_local_parts
+>>>  xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"?
+>>>   list element: lsearch;TESTSUITE/aux-fixed/0325.data
+>>>   xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0325.data")
+>>>  xxx in "+test_local_parts"? yes (matched "+test_local_parts")
 >>> check condition = ${if eq{$domain_data/$local_part_data}{DOMAIN DATA/LOCAL PART DATA}{no}{yes}}
 >>>                 = no
 >>> accept: condition test failed in ACL "a1"
 >>> processing "deny" (TESTSUITE/test-config 24)
 >>> check domains = +test_domains
->>> list element: +test_domains
->>> a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
+>>> a.b.c in "+test_domains"?
+>>>  list element: +test_domains
+>>>  a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
 >>> check local_parts = +test_local_parts
->>> list element: +test_local_parts
->>> xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)
+>>> xxx in "+test_local_parts"?
+>>>  list element: +test_local_parts
+>>>  xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)
 >>>   message: \$domain_data=$domain_data \$local_part_data=$local_part_data
 >>> deny: condition test succeeded in ACL "a1"
 >>> end of ACL "a1": DENY
diff --git a/test/stderr/0342 b/test/stderr/0342
index 4f98760db..a76e26d36 100644
--- a/test/stderr/0342
+++ b/test/stderr/0342
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 17)
@@ -17,14 +19,16 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1
 >>> calling dnslookup router
->>> list element: *
->>> ten-1 in "*"? yes (matched "*")
+>>> ten-1 in "*"?
+>>>  list element: *
+>>>  ten-1 in "*"? yes (matched "*")
 >>> re-routed to x@ten-1.test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling dnslookup router
->>> list element: *
->>> ten-1.test.ex in "*"? yes (matched "*")
+>>> ten-1.test.ex in "*"?
+>>>  list element: *
+>>>  ten-1.test.ex in "*"? yes (matched "*")
 >>> routed by dnslookup router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_rcpt"
diff --git a/test/stderr/0361 b/test/stderr/0361
index abb8924f9..c040548cb 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -8,22 +8,6 @@ LOG: MAIN
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -71,10 +55,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -113,22 +93,25 @@ routing kilos@recurse.test.ex
 --------> r1 router <--------
 local_part=kilos domain=recurse.test.ex
 checking domains
-list element: !thishost.test.ex
-list element: !recurse.test.ex.test.ex
+recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"?
+ list element: !thishost.test.ex
+ list element: !recurse.test.ex.test.ex
 recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? yes (end of list)
 calling r1 router
 r1 router called for kilos@recurse.test.ex
   domain = recurse.test.ex
-list element: *
-recurse.test.ex in "*"? yes (matched "*")
+recurse.test.ex in "*"?
+ list element: *
+ recurse.test.ex in "*"? yes (matched "*")
 DNS lookup of recurse.test.ex (MX) using fakens
 DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(MX) response length as 65535
  writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
-list element: *
-recurse.test.ex.test.ex in "*"? yes (matched "*")
+recurse.test.ex.test.ex in "*"?
+ list element: *
+ recurse.test.ex.test.ex in "*"? yes (matched "*")
 DNS lookup of recurse.test.ex.test.ex (MX) using fakens
 DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
@@ -161,21 +144,24 @@ routing kilos@recurse.test.ex.test.ex
 --------> r1 router <--------
 local_part=kilos domain=recurse.test.ex.test.ex
 checking domains
-list element: !thishost.test.ex
-list element: !recurse.test.ex.test.ex
-recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex")
+recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"?
+ list element: !thishost.test.ex
+ list element: !recurse.test.ex.test.ex
+ recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=kilos domain=recurse.test.ex.test.ex
 checking local_parts
-list element: miles
+kilos in "miles"?
+ list element: miles
 kilos in "miles"? no (end of list)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=kilos domain=recurse.test.ex.test.ex
 checking local_parts
-list element: kilos
-kilos in "kilos"? yes (matched "kilos")
+kilos in "kilos"?
+ list element: kilos
+ kilos in "kilos"? yes (matched "kilos")
 calling r3 router
 rda_interpret (string): '$local_part@$domain'
 expanded: 'kilos@recurse.test.ex.test.ex' (tainted)
@@ -205,14 +191,16 @@ routing kilos@recurse.test.ex.test.ex
 --------> r1 router <--------
 local_part=kilos domain=recurse.test.ex.test.ex
 checking domains
-list element: !thishost.test.ex
-list element: !recurse.test.ex.test.ex
-recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex")
+recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"?
+ list element: !thishost.test.ex
+ list element: !recurse.test.ex.test.ex
+ recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=kilos domain=recurse.test.ex.test.ex
 checking local_parts
-list element: miles
+kilos in "miles"?
+ list element: miles
 kilos in "miles"? no (end of list)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
diff --git a/test/stderr/0362 b/test/stderr/0362
index 851f774f6..de4e6d95e 100644
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -38,12 +22,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=test)
@@ -57,30 +43,36 @@ SMTP<< rcpt to:<x@a.b.c>
 using ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 22)
 check domains = +local_domains
-list element: +local_domains
- start sublist local_domains
-  list element: *.test.ex
-  a.b.c in "*.test.ex"? no (end of list)
- end sublist local_domains
+a.b.c in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   a.b.c in "*.test.ex"?
+   ╎list element: *.test.ex
+   a.b.c in "*.test.ex"? no (end of list)
+  end sublist local_domains
 a.b.c in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 23)
 check domains = +relay_domains
-list element: +relay_domains
- start sublist relay_domains
-  list element: a.b.c
-  a.b.c in "a.b.c"? yes (matched "a.b.c")
- end sublist relay_domains
-data from lookup saved for cache for +relay_domains: key 'a.b.c' value 'a.b.c'
-a.b.c in "+relay_domains"? yes (matched "+relay_domains")
+a.b.c in "+relay_domains"?
+ list element: +relay_domains
+  start sublist relay_domains
+   a.b.c in "a.b.c"?
+   ╎list element: a.b.c
+   ╎a.b.c in "a.b.c"? yes (matched "a.b.c")
+  end sublist relay_domains
+ data from lookup saved for cache for +relay_domains: key 'a.b.c' value 'a.b.c'
+ a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@a.b.c
-list element: x@a.b.c
-address match test: subject=x@a.b.c pattern=x@a.b.c
-list element: a.b.c
-a.b.c in "a.b.c"? yes (matched "a.b.c")
-x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
+x@a.b.c in "x@a.b.c"?
+ list element: x@a.b.c
+ address match test: subject=x@a.b.c pattern=x@a.b.c
+ a.b.c in "a.b.c"?
+  list element: a.b.c
+  a.b.c in "a.b.c"? yes (matched "a.b.c")
+ x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN
   "x@a.b.c" from env-to rewritten as "x@x.test.ex" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -90,23 +82,27 @@ routing x@x.test.ex
 --------> r1 router <--------
 local_part=x domain=x.test.ex
 checking domains
-list element: +relay_domains
- start sublist relay_domains
-  list element: a.b.c
-  x.test.ex in "a.b.c"? no (end of list)
- end sublist relay_domains
+x.test.ex in "+relay_domains"?
+ list element: +relay_domains
+  start sublist relay_domains
+   x.test.ex in "a.b.c"?
+   ╎list element: a.b.c
+   x.test.ex in "a.b.c"? no (end of list)
+  end sublist relay_domains
 x.test.ex in "+relay_domains"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=x.test.ex
 checking domains
-list element: +local_domains
- start sublist local_domains
-  list element: *.test.ex
-  x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'x.test.ex' value '*.test.ex'
-x.test.ex in "+local_domains"? yes (matched "+local_domains")
+x.test.ex in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   x.test.ex in "*.test.ex"?
+   ╎list element: *.test.ex
+   ╎x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'x.test.ex' value '*.test.ex'
+ x.test.ex in "+local_domains"? yes (matched "+local_domains")
 calling r2 router
 r2 router called for x@x.test.ex
   domain = x.test.ex
diff --git a/test/stderr/0371 b/test/stderr/0371
index a32b5fb48..0bf77157b 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -44,20 +28,27 @@ check set acl_c9 = $acl_c9; connect
                  = ; connect
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something
-list element: @
-list element: @[]
+something in helo_lookup_domains?
+ list element: @
+ list element: @[]
 something in helo_lookup_domains? no (end of list)
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
+host in limits_advertise_hosts?
+ list element: !*
 host in dsn_advertise_hosts? no (option unset)
-list element: *
-host in pipelining_advertise_hosts? yes (matched "*")
+host in pipelining_advertise_hosts?
+ list element: *
+  host in pipelining_advertise_hosts? yes (matched "*")
+host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
+host in tls_advertise_hosts?
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
        250-SIZE 52428800
        250-8BITMIME
@@ -123,8 +114,9 @@ LOG: MAIN
 SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< vrfy x@y
-list element: *
-host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+host in smtp_accept_max_nonmail_hosts?
+ list element: *
+  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 using ACL "vrfy"
 processing "accept" (TESTSUITE/test-config 41)
 check set acl_c0 = $acl_c0; vrfy
diff --git a/test/stderr/0381 b/test/stderr/0381
index 20ba8f7eb..02fc23de1 100644
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -41,12 +25,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
@@ -60,7 +46,8 @@ SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex
-list element: *.gov.uk.test.ex
+host in "*.gov.uk.test.ex"?
+ list element: *.gov.uk.test.ex
 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
@@ -82,22 +69,25 @@ Forward DNS security status: unverified
 sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
 	([V4NET.99.99.97] helo=test ident=CALLER)
-host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
+  host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 check hosts = !*.gov.uk.test.ex
-list element: !*.gov.uk.test.ex
-host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
+host in "!*.gov.uk.test.ex"?
+ list element: !*.gov.uk.test.ex
+  host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 19)
 check hosts = *.co.uk.test.ex
-list element: *.co.uk.test.ex
-host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
+host in "*.co.uk.test.ex"?
+ list element: *.co.uk.test.ex
+  host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 20)
 check hosts = !*.co.uk.test.ex
-list element: !*.co.uk.test.ex
-host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
+host in "!*.co.uk.test.ex"?
+ list element: !*.co.uk.test.ex
+  host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
 warn: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 accept: condition test succeeded in ACL "check_rcpt"
diff --git a/test/stderr/0384 b/test/stderr/0384
index 2b42c55f9..733766f0a 100644
--- a/test/stderr/0384
+++ b/test/stderr/0384
@@ -3,23 +3,33 @@
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> list element: *
->>> host in helo_verify_hosts? yes (matched "*")
+>>> host in helo_verify_hosts?
+>>>  list element: *
+>>>  host in helo_verify_hosts? yes (matched "*")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> [V4NET.9.8.7] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
 >>> matched host address
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> list element: @
->>> list element: @[]
+>>> host in tls_advertise_hosts?
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> [1.2.3.4] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [1.2.3.4] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[1.2.3.4]"
 LOG: rejected "EHLO [1.2.3.4]" from ([1.2.3.4]) [V4NET.9.8.7]
diff --git a/test/stderr/0386 b/test/stderr/0386
index b8c6b0a3c..ca912dc5a 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -41,12 +25,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.9.8.7]
 sender_rcvhost = [V4NET.9.8.7] (helo=test)
@@ -60,20 +46,23 @@ SMTP<< rcpt to:<1@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-list element: 1
-1 in "1"? yes (matched "1")
+1 in "1"?
+ list element: 1
+ 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  read ACL from file TESTSUITE/aux-fixed/0386.acl1
  processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
- list element: 
+  host in ":"?
+  list element: 
   host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
- list element: ^.*[@%!/|]
- compiled caseless RE '^.*[@%!/|]' not found in local cache
- compiled RE '^.*[@%!/|]' saved in local cache
+ 1 in "^.*[@%!/|]"?
+  list element: ^.*[@%!/|]
+  compiled caseless RE '^.*[@%!/|]' not found in local cache
+  compiled RE '^.*[@%!/|]' saved in local cache
  1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "require" (TESTSUITE/test-config 44)
@@ -121,19 +110,22 @@ SMTP<< rcpt to:<1@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-list element: 1
-1 in "1"? yes (matched "1")
+1 in "1"?
+ list element: 1
+ 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  using ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
- list element: 
+  host in ":"?
+  list element: 
   host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
- list element: ^.*[@%!/|]
- compiled caseless RE '^.*[@%!/|]' found in local cache
+ 1 in "^.*[@%!/|]"?
+  list element: ^.*[@%!/|]
+  compiled caseless RE '^.*[@%!/|]' found in local cache
  1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
  processing "require" (TESTSUITE/test-config 44)
@@ -181,22 +173,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -221,12 +197,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
@@ -240,13 +218,15 @@ SMTP<< rcpt to:<2@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-list element: 1
+2 in "1"?
+ list element: 1
 2 in "1"? no (end of list)
 accept: condition test failed in ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 check local_parts = 2
-list element: 2
-2 in "2"? yes (matched "2")
+2 in "2"?
+ list element: 2
+ 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  read ACL from file TESTSUITE/aux-fixed/0386.acl2
  processing "warn" (TESTSUITE/test-config 44)
@@ -310,10 +290,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1236
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -445,13 +421,15 @@ SMTP<< rcpt to:<2@b>
 using ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 18)
 check local_parts = 1
-list element: 1
+2 in "1"?
+ list element: 1
 2 in "1"? no (end of list)
 accept: condition test failed in ACL "chk_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 check local_parts = 2
-list element: 2
-2 in "2"? yes (matched "2")
+2 in "2"?
+ list element: 2
+ 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  using ACL "TESTSUITE/aux-fixed/0386.acl2"
  processing "warn" (TESTSUITE/test-config 44)
@@ -509,10 +487,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1238
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/0388 b/test/stderr/0388
index e61db433f..f3a48e5fc 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -39,7 +23,8 @@ routing x@y
 --------> r0 router <--------
 local_part=x domain=y
 checking local_parts
-list element: CALLER
+x in "CALLER"?
+ list element: CALLER
 x in "CALLER"? no (end of list)
 r0 router skipped: local_parts mismatch
 --------> r1 router <--------
@@ -48,8 +33,9 @@ calling r1 router
 r1 router called for x@y
   domain = y
 route_item = * "127.0.0.1 : V4NET.0.0.0"
-list element: *
-y in "*"? yes (matched "*")
+y in "*"?
+ list element: *
+ y in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1 : V4NET.0.0.0' options = ''
 expanded list of hosts = '127.0.0.1 : V4NET.0.0.0' options = ''
 set transport smtp
@@ -99,7 +85,8 @@ checking retry status of 127.0.0.1
 no retry data available
 127.0.0.1 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y)
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+ list element: 
  connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
@@ -126,11 +113,13 @@ cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK
-list element: *
-address match test: subject=*@127.0.0.1 pattern=*
-list element: *
-127.0.0.1 in "*"? yes (matched "*")
-*@127.0.0.1 in "*"? yes (matched "*")
+*@127.0.0.1 in "*"?
+ list element: *
+ address match test: subject=*@127.0.0.1 pattern=*
+ 127.0.0.1 in "*"?
+  list element: *
+  127.0.0.1 in "*"? yes (matched "*")
+ *@127.0.0.1 in "*"? yes (matched "*")
 Clearing TFO as not first host for message
 checking retry status of V4NET.0.0.0
  locking TESTSUITE/spool/db/retry.lockfile
@@ -141,7 +130,8 @@ checking retry status of V4NET.0.0.0
 no retry data available
 V4NET.0.0.0 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y)
-Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ...  failed: Network Error
+Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen?
+ failed: Network Error
 LOG: MAIN
   H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER
@@ -169,11 +159,13 @@ Deferred addresses:
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- list element: *
- address match test: subject=x@y pattern=*
- list element: *
- y in "*"? yes (matched "*")
- x@y in "*"? yes (matched "*")
+ x@y in "*"?
+  list element: *
+  address match test: subject=x@y pattern=*
+  y in "*"?
+   list element: *
+   y in "*"? yes (matched "*")
+  x@y in "*"? yes (matched "*")
 retry for R:x@y = * 0 0
  dbfn_read: key=R:x@y
 failing_interval=ttt message_age=ttt
@@ -181,11 +173,13 @@ Writing retry data for R:x@y
   first failed=dddd last try=dddd next try=+1 expired=1
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
  dbfn_write: key=R:x@y
- list element: *
- address match test: subject=*@V4NET.0.0.0 pattern=*
- list element: *
- V4NET.0.0.0 in "*"? yes (matched "*")
- *@V4NET.0.0.0 in "*"? yes (matched "*")
+ *@V4NET.0.0.0 in "*"?
+  list element: *
+  address match test: subject=*@V4NET.0.0.0 pattern=*
+  V4NET.0.0.0 in "*"?
+   list element: *
+   V4NET.0.0.0 in "*"? yes (matched "*")
+  *@V4NET.0.0.0 in "*"? yes (matched "*")
 retry for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S (y) = * 0 0
  dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S
 failing_interval=ttt message_age=ttt
@@ -204,10 +198,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1236
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -267,10 +257,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1237
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -298,12 +284,14 @@ routing CALLER@myhost.test.ex
 --------> r0 router <--------
 local_part=CALLER domain=myhost.test.ex
 checking local_parts
-list element: CALLER
-CALLER in "CALLER"? yes (matched "CALLER")
+CALLER in "CALLER"?
+ list element: CALLER
+ CALLER in "CALLER"? yes (matched "CALLER")
 checking senders
-list element: 
-address match test: subject= pattern=
- in ":"? yes (matched "")
+ in ":"?
+ list element: 
+ address match test: subject= pattern=
+  in ":"? yes (matched "")
 calling r0 router
 rda_interpret (string): ':blackhole:'
 expanded: ':blackhole:'
diff --git a/test/stderr/0391 b/test/stderr/0391
index 74d812c81..73fd5ce4a 100644
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -36,12 +20,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [1.2.3.4]
 sender_rcvhost = [1.2.3.4] (helo=test)
@@ -57,11 +43,13 @@ processing "accept" (TESTSUITE/test-config 18)
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y
-list element: *@*.x.y
-address match test: subject=U@w.x.y pattern=*@*.x.y
-list element: *.x.y
-w.x.y in "*.x.y"? yes (matched "*.x.y")
-U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
+U@W.x.y in "*@*.x.y"?
+ list element: *@*.x.y
+ address match test: subject=U@w.x.y pattern=*@*.x.y
+ w.x.y in "*.x.y"?
+  list element: *.x.y
+  w.x.y in "*.x.y"? yes (matched "*.x.y")
+ U@W.x.y in "*@*.x.y"? yes (matched "*@*.x.y")
 LOG: address_rewrite MAIN
   "U@W.x.y" from env-from rewritten as "U@x.y" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0394 b/test/stderr/0394
index 9b42e635d..25b6353cf 100644
--- a/test/stderr/0394
+++ b/test/stderr/0394
@@ -1,6 +1,7 @@
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: *
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -17,8 +18,9 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> end of ACL "connect": not OK
 LOG: H=[V4NET.255.255.255] rejected connection in "connect" ACL: host lookup failed (failed to find host name from IP address)
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: *
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -34,8 +36,9 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> require: condition test error in ACL "connect"
 LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "certificate/defer_ok" (this verify item has no options)
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: *
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -51,8 +54,9 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> require: condition test error in ACL "connect"
 LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "helo/defer_ok" (this verify item has no options)
 >>> host in hosts_connection_nolog? no (option unset)
->>> list element: *
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
diff --git a/test/stderr/0396 b/test/stderr/0396
index e38b8a7f8..6e28e452f 100644
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -38,10 +22,11 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept" (TESTSUITE/test-config 12)
 check domains = +fail
-list element: +fail
- start sublist fail
-  expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
- end sublist fail
+y in "+fail"?
+ list element: +fail
+  start sublist fail
+   expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+  end sublist fail
 y in "+fail"? no (end of list)
 accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
diff --git a/test/stderr/0398 b/test/stderr/0398
index 5708b6dce..8836a6d46 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -41,11 +25,13 @@ SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -56,20 +42,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 set transport t2
@@ -95,11 +84,13 @@ sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
 processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -110,20 +101,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
@@ -156,7 +150,8 @@ Attempting full verification using callout
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=PORT_S
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+ list element: 
  connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
@@ -200,11 +195,13 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<qq@remote>: 550 Unknown
 processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
@@ -212,21 +209,25 @@ SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny" (TESTSUITE/test-config 19)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
 deny: condition test failed in ACL "rcpt"
 processing "warn" (TESTSUITE/test-config 21)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying qq@remote
@@ -237,20 +238,23 @@ routing qq@remote
 --------> r1 router <--------
 local_part=qq domain=remote
 checking domains
-list element: local
+remote in "local"?
+ list element: local
 remote in "local"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=qq domain=remote
 checking domains
-list element: remote
-remote in "remote"? yes (matched "remote")
+remote in "remote"?
+ list element: remote
+ remote in "remote"? yes (matched "remote")
 calling r2 router
 r2 router called for qq@remote
   domain = remote
 route_item = * 127.0.0.1
-list element: *
-remote in "*"? yes (matched "*")
+remote in "*"?
+ list element: *
+ remote in "*"? yes (matched "*")
 original list of hosts = '127.0.0.1' options = ''
 expanded list of hosts = '127.0.0.1' options = ''
 finding IP address for 127.0.0.1
@@ -290,11 +294,13 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept" (TESTSUITE/test-config 24)
 check senders = qq@remote
-list element: qq@remote
-address match test: subject=qq@remote pattern=qq@remote
-list element: remote
-remote in "remote"? yes (matched "remote")
-qq@remote in "qq@remote"? yes (matched "qq@remote")
+qq@remote in "qq@remote"?
+ list element: qq@remote
+ address match test: subject=qq@remote pattern=qq@remote
+ remote in "remote"?
+  list element: remote
+  remote in "remote"? yes (matched "remote")
+ qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
diff --git a/test/stderr/0399 b/test/stderr/0399
index 1f7eb2bd2..a3b583e11 100644
--- a/test/stderr/0399
+++ b/test/stderr/0399
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0401 b/test/stderr/0401
index da8a29b10..4c44ff833 100644
--- a/test/stderr/0401
+++ b/test/stderr/0401
@@ -9,21 +9,25 @@
 >>> using ACL "connect"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
->>> list element: TESTSUITE/aux-var/0401.hosts1
->>> host in "TESTSUITE/aux-var/0401.hosts1"? yes (matched "V4NET.9.8.7" in TESTSUITE/aux-var/0401.hosts1)
+>>> host in "TESTSUITE/aux-var/0401.hosts1"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts1
+>>>  host in "TESTSUITE/aux-var/0401.hosts1"? yes (matched "V4NET.9.8.7" in TESTSUITE/aux-var/0401.hosts1)
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> xxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxx in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts2
->>> list element: TESTSUITE/aux-var/0401.hosts2
+>>> host in "TESTSUITE/aux-var/0401.hosts2"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts2
 >>> no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7])
->>> host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex)
+>>>  host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL "mail"
 >>> end of ACL "mail": implicit DENY
 LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL <x@y>
@@ -38,11 +42,12 @@ LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL <x@y>
 >>> using ACL "connect"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check hosts = TESTSUITE/aux-var/0401.hosts1
->>> list element: TESTSUITE/aux-var/0401.hosts1
+>>> host in "TESTSUITE/aux-var/0401.hosts1"?
+>>>  list element: TESTSUITE/aux-var/0401.hosts1
 >>> sender host name required, to match against *.2.2
 >>> looking up host name for V4NET.9.9.9
 LOG: no host name found for IP address V4NET.9.9.9
->>> host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
+>>>  host in "TESTSUITE/aux-var/0401.hosts1"? no (failed to find host name for V4NET.9.9.9)
 >>> accept: condition test failed in ACL "connect"
 >>> end of ACL "connect": implicit DENY
 LOG: H=[V4NET.9.9.9] rejected connection in "connect" ACL
diff --git a/test/stderr/0402 b/test/stderr/0402
index f46006909..4abead894 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -1,22 +1,8 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -402,10 +388,8 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 trusted user
@@ -485,34 +469,39 @@ routing rd+usery@test.ex
 --------> r1 router <--------
 local_part=rd+usery domain=test.ex
 checking local_parts
-list element: CALLER
+rd+usery in "CALLER"?
+ list element: CALLER
 rd+usery in "CALLER"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=rd+usery domain=test.ex
 checking local_parts
-list element: usery
+rd+usery in "usery"?
+ list element: usery
 rd+usery in "usery"? no (end of list)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=rd+usery domain=test.ex
 checking local_parts
-list element: userz
+rd+usery in "userz"?
+ list element: userz
 rd+usery in "userz"? no (end of list)
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=rd+usery domain=test.ex
 stripped prefix rd+
 checking local_parts
-list element: CALLER
+usery in "CALLER"?
+ list element: CALLER
 usery in "CALLER"? no (end of list)
 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=rd+usery domain=test.ex
 stripped prefix rd+
 checking local_parts
-list element: usery
-usery in "usery"? yes (matched "usery")
+usery in "usery"?
+ list element: usery
+ usery in "usery"? yes (matched "usery")
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
@@ -538,27 +527,31 @@ routing rd+CALLER@test.ex
 --------> r1 router <--------
 local_part=rd+CALLER domain=test.ex
 checking local_parts
-list element: CALLER
+rd+CALLER in "CALLER"?
+ list element: CALLER
 rd+CALLER in "CALLER"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=rd+CALLER domain=test.ex
 checking local_parts
-list element: usery
+rd+CALLER in "usery"?
+ list element: usery
 rd+CALLER in "usery"? no (end of list)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=rd+CALLER domain=test.ex
 checking local_parts
-list element: userz
+rd+CALLER in "userz"?
+ list element: userz
 rd+CALLER in "userz"? no (end of list)
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=rd+CALLER domain=test.ex
 stripped prefix rd+
 checking local_parts
-list element: CALLER
-CALLER in "CALLER"? yes (matched "CALLER")
+CALLER in "CALLER"?
+ list element: CALLER
+ CALLER in "CALLER"? yes (matched "CALLER")
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
@@ -584,20 +577,23 @@ routing userz@test.ex
 --------> r1 router <--------
 local_part=userz domain=test.ex
 checking local_parts
-list element: CALLER
+userz in "CALLER"?
+ list element: CALLER
 userz in "CALLER"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=userz domain=test.ex
 checking local_parts
-list element: usery
+userz in "usery"?
+ list element: usery
 userz in "usery"? no (end of list)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=userz domain=test.ex
 checking local_parts
-list element: userz
-userz in "userz"? yes (matched "userz")
+userz in "userz"?
+ list element: userz
+ userz in "userz"? yes (matched "userz")
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
@@ -620,14 +616,16 @@ routing usery@test.ex
 --------> r1 router <--------
 local_part=usery domain=test.ex
 checking local_parts
-list element: CALLER
+usery in "CALLER"?
+ list element: CALLER
 usery in "CALLER"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=usery domain=test.ex
 checking local_parts
-list element: usery
-usery in "usery"? yes (matched "usery")
+usery in "usery"?
+ list element: usery
+ usery in "usery"? yes (matched "usery")
  ╭considering: /non-exist/$domain
  ├───────text: /non-exist/
  ├considering: $domain
@@ -650,8 +648,9 @@ routing CALLER@test.ex
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
-list element: CALLER
-CALLER in "CALLER"? yes (matched "CALLER")
+CALLER in "CALLER"?
+ list element: CALLER
+ CALLER in "CALLER"? yes (matched "CALLER")
  ╭considering: /non-exist/$local_part
  ├───────text: /non-exist/
  ├considering: $local_part
diff --git a/test/stderr/0403 b/test/stderr/0403
index f2edddcb6..e479b0c54 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -65,10 +49,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -107,36 +87,38 @@ routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-list element: lsearch;TESTSUITE/aux-fixed/0403.data
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="test.ex" opts=NULL
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0403.data
-creating new cache entry
-lookup yielded: [DOMAINDATA_test.ex]
-test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="test.ex" opts=NULL
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [DOMAINDATA_test.ex]
+ test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 checking local_parts
-list element: lsearch;TESTSUITE/aux-fixed/0403.data
-search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-  0TESTSUITE/aux-fixed/0403.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="userx" opts=NULL
-file lookup required for userx
-  in TESTSUITE/aux-fixed/0403.data
-creating new cache entry
-lookup yielded: [LOCALPARTDATA_userx]
-userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
+userx in "lsearch;TESTSUITE/aux-fixed/0403.data"?
+ list element: lsearch;TESTSUITE/aux-fixed/0403.data
+ search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0403.data"
+   key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+   0TESTSUITE/aux-fixed/0403.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
+   type=lsearch key="userx" opts=NULL
+ file lookup required for userx
+   in TESTSUITE/aux-fixed/0403.data
+ creating new cache entry
+ lookup yielded: [LOCALPARTDATA_userx]
+ userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data")
 +++ROUTER:
 +++domain_data=[DOMAINDATA_test.ex]
 +++local_part_data=[LOCALPARTDATA_userx]
diff --git a/test/stderr/0404 b/test/stderr/0404
index 2edb17117..b3cccddcc 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -164,10 +148,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -208,7 +188,8 @@ routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking local_parts
-list element: sender
+userx in "sender"?
+ list element: sender
 userx in "sender"? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
@@ -273,10 +254,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -942,10 +919,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1239
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -6449,8 +6422,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6467,8 +6441,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6484,8 +6459,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6501,8 +6477,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6518,8 +6495,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6535,8 +6513,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6552,8 +6531,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6569,8 +6549,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6586,8 +6567,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6603,8 +6585,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6620,8 +6603,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6637,8 +6621,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6654,8 +6639,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6671,8 +6657,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6688,8 +6675,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6705,8 +6693,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6722,8 +6711,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6739,8 +6729,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6756,8 +6747,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6773,8 +6765,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6790,8 +6783,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6807,8 +6801,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6824,8 +6819,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6841,8 +6837,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6858,8 +6855,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6875,8 +6873,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6892,8 +6891,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6909,8 +6909,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6926,8 +6927,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6943,8 +6945,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6960,8 +6963,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6977,8 +6981,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -6994,8 +6999,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7011,8 +7017,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7028,8 +7035,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7045,8 +7053,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7062,8 +7071,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7079,8 +7089,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7096,8 +7107,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7113,8 +7125,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7130,8 +7143,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7147,8 +7161,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7164,8 +7179,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7181,8 +7197,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7198,8 +7215,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7215,8 +7233,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7232,8 +7251,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7249,8 +7269,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7266,8 +7287,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7283,8 +7305,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7300,8 +7323,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7317,8 +7341,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7334,8 +7359,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7351,8 +7377,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7368,8 +7395,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7385,8 +7413,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7402,8 +7431,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7419,8 +7449,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7436,8 +7467,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7453,8 +7485,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7470,8 +7503,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7487,8 +7521,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7504,8 +7539,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7521,8 +7557,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7538,8 +7575,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7555,8 +7593,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7572,8 +7611,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7589,8 +7629,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7606,8 +7647,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7623,8 +7665,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7640,8 +7683,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7657,8 +7701,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7674,8 +7719,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7691,8 +7737,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7708,8 +7755,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7725,8 +7773,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7742,8 +7791,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7759,8 +7809,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7776,8 +7827,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7793,8 +7845,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7810,8 +7863,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7827,8 +7881,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7844,8 +7899,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7861,8 +7917,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7878,8 +7935,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7895,8 +7953,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7912,8 +7971,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7929,8 +7989,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7946,8 +8007,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7963,8 +8025,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7980,8 +8043,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -7997,8 +8061,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8014,8 +8079,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8031,8 +8097,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8048,8 +8115,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8065,8 +8133,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8082,8 +8151,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8099,8 +8169,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8116,8 +8187,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8133,8 +8205,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8150,8 +8223,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8167,8 +8241,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8184,8 +8259,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8201,8 +8277,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8218,8 +8295,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8235,8 +8313,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8252,8 +8331,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8269,8 +8349,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8286,8 +8367,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8303,8 +8385,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8320,8 +8403,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8337,8 +8421,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8354,8 +8439,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8371,8 +8457,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8388,8 +8475,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8405,8 +8493,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8422,8 +8511,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8439,8 +8529,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8456,8 +8547,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8473,8 +8565,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8490,8 +8583,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8507,8 +8601,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8524,8 +8619,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8541,8 +8637,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8558,8 +8655,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8575,8 +8673,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8592,8 +8691,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8609,8 +8709,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8626,8 +8727,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8643,8 +8745,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8660,8 +8763,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8677,8 +8781,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8694,8 +8799,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8711,8 +8817,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8728,8 +8835,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8745,8 +8853,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8762,8 +8871,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8779,8 +8889,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8796,8 +8907,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8813,8 +8925,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8830,8 +8943,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8847,8 +8961,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8864,8 +8979,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8881,8 +8997,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8898,8 +9015,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8915,8 +9033,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8932,8 +9051,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8949,8 +9069,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8966,8 +9087,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -8983,8 +9105,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9000,8 +9123,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9017,8 +9141,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9034,8 +9159,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9051,8 +9177,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9068,8 +9195,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9085,8 +9213,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9102,8 +9231,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9119,8 +9249,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9136,8 +9267,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9153,8 +9285,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9170,8 +9303,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9187,8 +9321,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9204,8 +9339,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9221,8 +9357,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9238,8 +9375,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9255,8 +9393,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9272,8 +9411,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9289,8 +9429,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9306,8 +9447,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9323,8 +9465,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9340,8 +9483,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9357,8 +9501,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9374,8 +9519,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9391,8 +9537,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9408,8 +9555,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9425,8 +9573,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9442,8 +9591,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9459,8 +9609,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9476,8 +9627,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9493,8 +9645,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9510,8 +9663,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9527,8 +9681,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9544,8 +9699,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9561,8 +9717,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9578,8 +9735,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9595,8 +9753,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9612,8 +9771,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9629,8 +9789,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9646,8 +9807,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9663,8 +9825,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9680,8 +9843,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9697,8 +9861,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9714,8 +9879,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9731,8 +9897,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9748,8 +9915,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9765,8 +9933,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9782,8 +9951,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9799,8 +9969,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9816,8 +9987,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9833,8 +10005,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9850,8 +10023,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9867,8 +10041,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9884,8 +10059,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9901,8 +10077,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9918,8 +10095,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9935,8 +10113,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9952,8 +10131,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9969,8 +10149,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -9986,8 +10167,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10003,8 +10185,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10020,8 +10203,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10037,8 +10221,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10054,8 +10239,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10071,8 +10257,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10088,8 +10275,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10105,8 +10293,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10122,8 +10311,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10139,8 +10329,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10156,8 +10347,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10173,8 +10365,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10190,8 +10383,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10207,8 +10401,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10224,8 +10419,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10241,8 +10437,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10258,8 +10455,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10275,8 +10473,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10292,8 +10491,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10309,8 +10509,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10326,8 +10527,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10343,8 +10545,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10360,8 +10563,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10377,8 +10581,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10394,8 +10599,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10411,8 +10617,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10428,8 +10635,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10445,8 +10653,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10462,8 +10671,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10479,8 +10689,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10496,8 +10707,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10513,8 +10725,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10530,8 +10743,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10547,8 +10761,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10564,8 +10779,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10581,8 +10797,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10598,8 +10815,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10615,8 +10833,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10632,8 +10851,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10649,8 +10869,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10666,8 +10887,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10683,8 +10905,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10700,8 +10923,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10717,8 +10941,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10734,8 +10959,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10751,8 +10977,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10768,8 +10995,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10785,8 +11013,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10802,8 +11031,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10819,8 +11049,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10836,8 +11067,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10853,8 +11085,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10870,8 +11103,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10887,8 +11121,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10904,8 +11139,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10921,8 +11157,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10938,8 +11175,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10955,8 +11193,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10972,8 +11211,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -10989,8 +11229,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11006,8 +11247,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11023,8 +11265,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11040,8 +11283,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11057,8 +11301,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11074,8 +11319,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11091,8 +11337,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11108,8 +11355,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11125,8 +11373,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11142,8 +11391,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11159,8 +11409,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11176,8 +11427,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11193,8 +11445,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11210,8 +11463,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11227,8 +11481,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11244,8 +11499,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11261,8 +11517,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11278,8 +11535,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11295,8 +11553,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11312,8 +11571,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11329,8 +11589,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11346,8 +11607,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11363,8 +11625,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11380,8 +11643,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11397,8 +11661,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11414,8 +11679,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11431,8 +11697,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11448,8 +11715,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11465,8 +11733,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11482,8 +11751,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11499,8 +11769,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11516,8 +11787,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11533,8 +11805,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11550,8 +11823,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11567,8 +11841,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11584,8 +11859,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11601,8 +11877,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11618,8 +11895,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11635,8 +11913,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11652,8 +11931,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11669,8 +11949,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11686,8 +11967,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11703,8 +11985,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11720,8 +12003,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11737,8 +12021,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11754,8 +12039,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11771,8 +12057,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11788,8 +12075,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11805,8 +12093,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11822,8 +12111,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11839,8 +12129,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11856,8 +12147,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11873,8 +12165,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11890,8 +12183,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11907,8 +12201,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11924,8 +12219,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11941,8 +12237,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11958,8 +12255,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11975,8 +12273,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -11992,8 +12291,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12009,8 +12309,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12026,8 +12327,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12043,8 +12345,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12060,8 +12363,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12077,8 +12381,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12094,8 +12399,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12111,8 +12417,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12128,8 +12435,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12145,8 +12453,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12162,8 +12471,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12179,8 +12489,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12196,8 +12507,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12213,8 +12525,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12230,8 +12543,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12247,8 +12561,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12264,8 +12579,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12281,8 +12597,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12298,8 +12615,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12315,8 +12633,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12332,8 +12651,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12349,8 +12669,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12366,8 +12687,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12383,8 +12705,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12400,8 +12723,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12417,8 +12741,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12434,8 +12759,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12451,8 +12777,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12468,8 +12795,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12485,8 +12813,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12502,8 +12831,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12519,8 +12849,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12536,8 +12867,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12553,8 +12885,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12570,8 +12903,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12587,8 +12921,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12604,8 +12939,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12621,8 +12957,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12638,8 +12975,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12655,8 +12993,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12672,8 +13011,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12689,8 +13029,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12706,8 +13047,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12723,8 +13065,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12740,8 +13083,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12757,8 +13101,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12774,8 +13119,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12791,8 +13137,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12808,8 +13155,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12825,8 +13173,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12842,8 +13191,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12859,8 +13209,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12876,8 +13227,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12893,8 +13245,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12910,8 +13263,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12927,8 +13281,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12944,8 +13299,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12961,8 +13317,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12978,8 +13335,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -12995,8 +13353,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13012,8 +13371,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13029,8 +13389,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13046,8 +13407,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13063,8 +13425,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13080,8 +13443,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13097,8 +13461,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13114,8 +13479,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13131,8 +13497,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13148,8 +13515,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13165,8 +13533,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13182,8 +13551,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13199,8 +13569,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13216,8 +13587,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13233,8 +13605,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13250,8 +13623,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13267,8 +13641,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13284,8 +13659,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13301,8 +13677,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13318,8 +13695,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13335,8 +13713,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13352,8 +13731,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13369,8 +13749,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13386,8 +13767,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13403,8 +13785,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13420,8 +13803,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13437,8 +13821,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13454,8 +13839,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13471,8 +13857,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13488,8 +13875,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13505,8 +13893,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13522,8 +13911,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13539,8 +13929,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13556,8 +13947,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13573,8 +13965,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13590,8 +13983,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13607,8 +14001,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13624,8 +14019,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13641,8 +14037,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13658,8 +14055,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13675,8 +14073,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13692,8 +14091,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13709,8 +14109,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13726,8 +14127,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13743,8 +14145,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13760,8 +14163,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13777,8 +14181,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13794,8 +14199,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13811,8 +14217,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13828,8 +14235,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13845,8 +14253,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13862,8 +14271,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13879,8 +14289,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13896,8 +14307,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13913,8 +14325,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13930,8 +14343,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13947,8 +14361,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13964,8 +14379,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13981,8 +14397,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -13998,8 +14415,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14015,8 +14433,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14032,8 +14451,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14049,8 +14469,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14066,8 +14487,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14083,8 +14505,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14100,8 +14523,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14117,8 +14541,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14134,8 +14559,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14151,8 +14577,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14168,8 +14595,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14185,8 +14613,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14202,8 +14631,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14219,8 +14649,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14236,8 +14667,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14253,8 +14685,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14270,8 +14703,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14287,8 +14721,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14304,8 +14739,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14321,8 +14757,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14338,8 +14775,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14355,8 +14793,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14372,8 +14811,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14389,8 +14829,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14406,8 +14847,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14423,8 +14865,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14440,8 +14883,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14457,8 +14901,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14474,8 +14919,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14491,8 +14937,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14508,8 +14955,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14525,8 +14973,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14542,8 +14991,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14559,8 +15009,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14576,8 +15027,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14593,8 +15045,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14610,8 +15063,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14627,8 +15081,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14644,8 +15099,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14661,8 +15117,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14678,8 +15135,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14695,8 +15153,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14712,8 +15171,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14729,8 +15189,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14746,8 +15207,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14763,8 +15225,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14780,8 +15243,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14797,8 +15261,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14814,8 +15279,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14831,8 +15297,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14848,8 +15315,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14865,8 +15333,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14882,8 +15351,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14899,8 +15369,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14916,8 +15387,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14933,8 +15405,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14950,8 +15423,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14967,8 +15441,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -14984,8 +15459,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15001,8 +15477,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15018,8 +15495,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15035,8 +15513,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15052,8 +15531,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15069,8 +15549,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15086,8 +15567,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15103,8 +15585,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15120,8 +15603,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15137,8 +15621,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15154,8 +15639,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15171,8 +15657,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15188,8 +15675,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15205,8 +15693,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15222,8 +15711,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15239,8 +15729,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15256,8 +15747,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15273,8 +15765,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15290,8 +15783,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15307,8 +15801,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15324,8 +15819,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15341,8 +15837,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15358,8 +15855,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15375,8 +15873,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15392,8 +15891,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15409,8 +15909,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15426,8 +15927,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15443,8 +15945,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15460,8 +15963,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15477,8 +15981,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15494,8 +15999,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15511,8 +16017,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15528,8 +16035,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15545,8 +16053,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15562,8 +16071,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15579,8 +16089,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15596,8 +16107,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15613,8 +16125,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15630,8 +16143,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15647,8 +16161,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15664,8 +16179,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15681,8 +16197,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15698,8 +16215,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15715,8 +16233,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15732,8 +16251,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15749,8 +16269,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15766,8 +16287,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15783,8 +16305,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15800,8 +16323,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15817,8 +16341,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15834,8 +16359,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15851,8 +16377,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15868,8 +16395,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15885,8 +16413,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15902,8 +16431,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15919,8 +16449,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15936,8 +16467,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15953,8 +16485,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15970,8 +16503,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -15987,8 +16521,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16004,8 +16539,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16021,8 +16557,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16038,8 +16575,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16055,8 +16593,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16072,8 +16611,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16089,8 +16629,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16106,8 +16647,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16123,8 +16665,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16140,8 +16683,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16157,8 +16701,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16174,8 +16719,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16191,8 +16737,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16208,8 +16755,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16225,8 +16773,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16242,8 +16791,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16259,8 +16809,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16276,8 +16827,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16293,8 +16845,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16310,8 +16863,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16327,8 +16881,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16344,8 +16899,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16361,8 +16917,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16378,8 +16935,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16395,8 +16953,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16412,8 +16971,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16429,8 +16989,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16446,8 +17007,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16463,8 +17025,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16480,8 +17043,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16497,8 +17061,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16514,8 +17079,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16531,8 +17097,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16548,8 +17115,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16565,8 +17133,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16582,8 +17151,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16599,8 +17169,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16616,8 +17187,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16633,8 +17205,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16650,8 +17223,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16667,8 +17241,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16684,8 +17259,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16701,8 +17277,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16718,8 +17295,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16735,8 +17313,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16752,8 +17331,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
@@ -16769,8 +17349,9 @@ routing sender@test.ex
 --------> r1 router <--------
 local_part=sender domain=test.ex
 checking local_parts
-list element: sender
-sender in "sender"? yes (matched "sender")
+sender in "sender"?
+ list element: sender
+ sender in "sender"? yes (matched "sender")
 calling r1 router
 r1 router called for sender@test.ex
   domain = test.ex
diff --git a/test/stderr/0408 b/test/stderr/0408
index e50472ce3..af0759cab 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -65,10 +49,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -107,8 +87,9 @@ routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking local_parts
-list element: userx
-userx in "userx : usery"? yes (matched "userx")
+userx in "userx : usery"?
+ list element: userx
+ userx in "userx : usery"? yes (matched "userx")
 calling r1 router
 r1 router called for userx@test.ex
   domain = test.ex
@@ -122,9 +103,10 @@ routing usery@test.ex
 --------> r1 router <--------
 local_part=usery domain=test.ex
 checking local_parts
-list element: userx
-list element: usery
-usery in "userx : usery"? yes (matched "usery")
+usery in "userx : usery"?
+ list element: userx
+ list element: usery
+ usery in "userx : usery"? yes (matched "usery")
 calling r1 router
 r1 router called for usery@test.ex
   domain = test.ex
diff --git a/test/stderr/0414 b/test/stderr/0414
index 5183f09ed..995958670 100644
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -34,57 +18,62 @@ routing x@b.domain
 --------> r1 router <--------
 local_part=x domain=b.domain
 checking domains
-list element: !+C
- start sublist C
-  list element: +A
-   start sublist A
-   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list1
-   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
-   ╎search_find: file="TESTSUITE/aux-fixed/0414.list1"
-   ╎  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-   ╎LRU list:
-   ╎  ;TESTSUITE/aux-fixed/0414.list1
-   ╎  End
-   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
-   ╎  type=lsearch key="b.domain" opts=NULL
-   ╎file lookup required for b.domain
-   ╎  in TESTSUITE/aux-fixed/0414.list1
-   ╎creating new cache entry
-   ╎lookup failed
-   ╎b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
-   end sublist A
-  list element: +B
-   start sublist B
-   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list2
-   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
-   ╎search_find: file="TESTSUITE/aux-fixed/0414.list2"
-   ╎  key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-   ╎LRU list:
-   ╎  ;TESTSUITE/aux-fixed/0414.list2
-   ╎  ;TESTSUITE/aux-fixed/0414.list1
-   ╎  End
-   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
-   ╎  type=lsearch key="b.domain" opts=NULL
-   ╎file lookup required for b.domain
-   ╎  in TESTSUITE/aux-fixed/0414.list2
-   ╎creating new cache entry
-   ╎lookup yielded: b.domain-data
-   ╎b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
-   end sublist B
-  data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'
-  b.domain in "+A : +B"? yes (matched "+B")
- end sublist C
-data from lookup saved for cache for +C: key 'b.domain' value 'b.domain-data'
-b.domain in "!+C"? no (matched "!+C")
+b.domain in "!+C"?
+ list element: !+C
+  start sublist C
+   b.domain in "+A : +B"?
+   ╎list element: +A
+   ╎ start sublist A
+   ╎  b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"?
+   ╎   list element: lsearch;TESTSUITE/aux-fixed/0414.list1
+   ╎   search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
+   ╎   search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎     key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎   LRU list:
+   ╎     <TESTSUITE/aux-fixed/0414.list1
+   ╎     End
+   ╎   internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎     type=lsearch key="b.domain" opts=NULL
+   ╎   file lookup required for b.domain
+   ╎     in TESTSUITE/aux-fixed/0414.list1
+   ╎   creating new cache entry
+   ╎   lookup failed
+   ╎  b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? no (end of list)
+   ╎ end sublist A
+   ╎list element: +B
+   ╎ start sublist B
+   ╎  b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"?
+   ╎   list element: lsearch;TESTSUITE/aux-fixed/0414.list2
+   ╎   search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
+   ╎   search_find: file="TESTSUITE/aux-fixed/0414.list2"
+   ╎     key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎   LRU list:
+   ╎     <TESTSUITE/aux-fixed/0414.list2
+   ╎     <TESTSUITE/aux-fixed/0414.list1
+   ╎     End
+   ╎   internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
+   ╎     type=lsearch key="b.domain" opts=NULL
+   ╎   file lookup required for b.domain
+   ╎     in TESTSUITE/aux-fixed/0414.list2
+   ╎   creating new cache entry
+   ╎   lookup yielded: b.domain-data
+   ╎   b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
+   ╎ end sublist B
+   ╎data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'
+   ╎b.domain in "+A : +B"? yes (matched "+B")
+  end sublist C
+ data from lookup saved for cache for +C: key 'b.domain' value 'b.domain-data'
+ b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=b.domain
 checking domains
-list element: +B
- start sublist B
-cached yes match for +B
-cached lookup data = b.domain-data
-b.domain in "+B"? yes (matched "+B" - cached)
+b.domain in "+B"?
+ list element: +B
+  start sublist B
+ cached yes match for +B
+ cached lookup data = b.domain-data
+ b.domain in "+B"? yes (matched "+B" - cached)
 domain_data=b.domain-data
 calling r2 router
 r2 router called for x@b.domain
@@ -106,65 +95,71 @@ routing x@a.domain
 --------> r1 router <--------
 local_part=x domain=a.domain
 checking domains
-list element: !+C
- start sublist C
-  list element: +A
-   start sublist A
-   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list1
-   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
+a.domain in "!+C"?
+ list element: !+C
+  start sublist C
+   a.domain in "+A : +B"?
+   ╎list element: +A
+   ╎ start sublist A
+   ╎  a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"?
+   ╎   list element: lsearch;TESTSUITE/aux-fixed/0414.list1
+   ╎   search_open: lsearch "TESTSUITE/aux-fixed/0414.list1"
+   ╎     cached open
+   ╎   search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎     key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎   LRU list:
+   ╎     <TESTSUITE/aux-fixed/0414.list1
+   ╎     <TESTSUITE/aux-fixed/0414.list2
+   ╎     End
+   ╎   internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎     type=lsearch key="a.domain" opts=NULL
+   ╎   file lookup required for a.domain
+   ╎     in TESTSUITE/aux-fixed/0414.list1
+   ╎   creating new cache entry
+   ╎   lookup yielded: a.domain-data
+   ╎   a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
+   ╎ end sublist A
+   ╎data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'
+   ╎a.domain in "+A : +B"? yes (matched "+A")
+  end sublist C
+ data from lookup saved for cache for +C: key 'a.domain' value 'a.domain-data'
+ a.domain in "!+C"? no (matched "!+C")
+r1 router skipped: domains mismatch
+--------> r2 router <--------
+local_part=x domain=a.domain
+checking domains
+a.domain in "+B"?
+ list element: +B
+  start sublist B
+   a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0414.list2
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
    ╎  cached open
-   ╎search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎search_find: file="TESTSUITE/aux-fixed/0414.list2"
    ╎  key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
    ╎LRU list:
-   ╎  ;TESTSUITE/aux-fixed/0414.list1
-   ╎  ;TESTSUITE/aux-fixed/0414.list2
+   ╎  <TESTSUITE/aux-fixed/0414.list2
+   ╎  <TESTSUITE/aux-fixed/0414.list1
    ╎  End
-   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list1"
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
    ╎  type=lsearch key="a.domain" opts=NULL
    ╎file lookup required for a.domain
-   ╎  in TESTSUITE/aux-fixed/0414.list1
+   ╎  in TESTSUITE/aux-fixed/0414.list2
    ╎creating new cache entry
-   ╎lookup yielded: a.domain-data
-   ╎a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
-   end sublist A
-  data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'
-  a.domain in "+A : +B"? yes (matched "+A")
- end sublist C
-data from lookup saved for cache for +C: key 'a.domain' value 'a.domain-data'
-a.domain in "!+C"? no (matched "!+C")
-r1 router skipped: domains mismatch
---------> r2 router <--------
-local_part=x domain=a.domain
-checking domains
-list element: +B
- start sublist B
-  list element: lsearch;TESTSUITE/aux-fixed/0414.list2
-  search_open: lsearch "TESTSUITE/aux-fixed/0414.list2"
-    cached open
-  search_find: file="TESTSUITE/aux-fixed/0414.list2"
-    key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL
-  LRU list:
-    0TESTSUITE/aux-fixed/0414.list2
-    0TESTSUITE/aux-fixed/0414.list1
-    End
-  internal_search_find: file="TESTSUITE/aux-fixed/0414.list2"
-    type=lsearch key="a.domain" opts=NULL
-  file lookup required for a.domain
-    in TESTSUITE/aux-fixed/0414.list2
-  creating new cache entry
-  lookup failed
-  a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? no (end of list)
- end sublist B
+   ╎lookup failed
+   a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? no (end of list)
+  end sublist B
 a.domain in "+B"? no (end of list)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=x domain=a.domain
 checking domains
-list element: +A
- start sublist A
-cached yes match for +A
-cached lookup data = a.domain-data
-a.domain in "+A"? yes (matched "+A" - cached)
+a.domain in "+A"?
+ list element: +A
+  start sublist A
+ cached yes match for +A
+ cached lookup data = a.domain-data
+ a.domain in "+A"? yes (matched "+A" - cached)
 domain_data=a.domain-data
 calling r3 router
 r3 router called for x@a.domain
diff --git a/test/stderr/0419 b/test/stderr/0419
index f7a0fbc5f..6ea0d7822 100644
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -33,39 +17,46 @@ routing k@mxt13.test.ex
 --------> dnslookup router <--------
 local_part=k domain=mxt13.test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
+mxt13.test.ex in "! +local_domains"?
+ list element: ! +local_domains
+  start sublist local_domains
+   mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
 mxt13.test.ex in "! +local_domains"? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
-list element: *
-mxt13.test.ex in "*"? yes (matched "*")
+mxt13.test.ex in "*"?
+ list element: *
+ mxt13.test.ex in "*"? yes (matched "*")
 DNS lookup of mxt13.test.ex (MX) using fakens
 DNS lookup of mxt13.test.ex (MX) succeeded
 DNS lookup of other1.test.ex (A) using fakens
 DNS lookup of other1.test.ex (A) succeeded
 DNS lookup of other2.test.ex (A) using fakens
 DNS lookup of other2.test.ex (A) succeeded
-list element: +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  list element: !other1.test.ex
-  other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
- end sublist local_domains
+other1.test.ex in hosts_treat_as_local?
+ list element: +local_domains
+  start sublist local_domains
+   other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎list element: !other1.test.ex
+   ╎other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
+  end sublist local_domains
 other1.test.ex in hosts_treat_as_local? no (end of list)
-list element: +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  list element: !other1.test.ex
-  list element: *.test.ex
-  other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
- end sublist local_domains
-other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
+other2.test.ex in hosts_treat_as_local?
+ list element: +local_domains
+  start sublist local_domains
+   other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎list element: !other1.test.ex
+   ╎list element: *.test.ex
+   ╎other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
+  end sublist local_domains
+ other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
 local host in host list - removed hosts:
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
diff --git a/test/stderr/0422 b/test/stderr/0422
index a64d7a7c3..11178b44a 100644
--- a/test/stderr/0422
+++ b/test/stderr/0422
@@ -19,7 +19,8 @@
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
diff --git a/test/stderr/0432 b/test/stderr/0432
index 7462b35d9..f041804fe 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
@@ -30,22 +32,6 @@ MUNGED: ::1 will be omitted in what follows
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -65,12 +51,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [1.2.3.4]
 sender_rcvhost = [1.2.3.4] (helo=test)
@@ -119,7 +107,8 @@ Attempting full verification using callout
  EXIM_DBCLOSE(0xAAAAAAAA)
  closed hints database and lockfile
 interface=NULL port=PORT_S
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+ list element: 
  connected
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
@@ -170,22 +159,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -205,12 +178,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [1.2.3.4]
 sender_rcvhost = [1.2.3.4] (helo=test)
@@ -278,9 +253,11 @@ search_tidyup called
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
@@ -308,9 +285,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
@@ -327,7 +306,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=PORT_S
->>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+>>>  list element: 
 >>> >>>  connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
@@ -360,9 +340,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
@@ -379,7 +361,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=PORT_S
->>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... list element: 
+>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen?
+>>>  list element: 
 >>> >>>  connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
diff --git a/test/stderr/0433 b/test/stderr/0433
index c051eaa4c..40eef044c 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -3,22 +3,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -41,22 +25,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -80,22 +48,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -120,22 +72,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -160,22 +96,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -201,22 +121,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1239
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0435 b/test/stderr/0435
index f9a8b22de..916f23c94 100644
--- a/test/stderr/0435
+++ b/test/stderr/0435
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
diff --git a/test/stderr/0438 b/test/stderr/0438
index 297845714..58f8d8262 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -3,22 +3,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -43,22 +27,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -83,22 +51,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0443 b/test/stderr/0443
index de22ede82..58d423dd7 100644
--- a/test/stderr/0443
+++ b/test/stderr/0443
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
@@ -16,8 +18,9 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@ten-1.test.ex
 >>> calling r1 router
->>> list element: *
->>> ten-1.test.ex in "*"? yes (matched "*")
+>>> ten-1.test.ex in "*"?
+>>>  list element: *
+>>>  ten-1.test.ex in "*"? yes (matched "*")
 >>> routed by r1 router
 >>> Attempting full verification using callout
 >>> callout cache: no domain record found for ten-1.test.ex
diff --git a/test/stderr/0445 b/test/stderr/0445
index fa90817a1..5394493d9 100644
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "deny" (TESTSUITE/test-config 20)
diff --git a/test/stderr/0453 b/test/stderr/0453
index ff252a12d..2fe5e4c2f 100644
--- a/test/stderr/0453
+++ b/test/stderr/0453
@@ -6,8 +6,10 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> xxxx in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> xxxx in helo_lookup_domains? no (end of list)
 LOG: SMTP call from (xxxx) [V4NET.0.0.1] dropped: too many syntax or protocol errors (last command was "rcpt to:<bad syntax@x.y.z>",  C=HELO,MAIL,RCPT,RCPT,RCPT,RCPT)
diff --git a/test/stderr/0463 b/test/stderr/0463
index 25f9f9c34..e395c2259 100644
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -32,7 +16,8 @@ routing x@ten-1
 --------> all router <--------
 local_part=x domain=ten-1
 checking domains
-list element: !@mx_any
+ten-1 in "!@mx_any"?
+ list element: !@mx_any
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
@@ -43,8 +28,9 @@ ten-1 in "!@mx_any"? yes (end of list)
 calling all router
 all router called for x@ten-1
   domain = ten-1
-list element: *
-ten-1 in "*"? yes (matched "*")
+ten-1 in "*"?
+ list element: *
+ ten-1 in "*"? yes (matched "*")
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
@@ -65,7 +51,8 @@ routing x@ten-1.test.ex
 --------> all router <--------
 local_part=x domain=ten-1.test.ex
 checking domains
-list element: !@mx_any
+ten-1.test.ex in "!@mx_any"?
+ list element: !@mx_any
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
@@ -76,8 +63,9 @@ ten-1.test.ex in "!@mx_any"? yes (end of list)
 calling all router
 all router called for x@ten-1.test.ex
   domain = ten-1.test.ex
-list element: *
-ten-1.test.ex in "*"? yes (matched "*")
+ten-1.test.ex in "*"?
+ list element: *
+ ten-1.test.ex in "*"? yes (matched "*")
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
diff --git a/test/stderr/0464 b/test/stderr/0464
index 4037cfacd..d2c774466 100644
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -39,25 +23,27 @@ SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
 processing "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
-list element: +special_domains
- start sublist special_domains
-  list element: lsearch;TESTSUITE/aux-fixed/0464.domains
-  search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-  search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-  LRU list:
-    0TESTSUITE/aux-fixed/0464.domains
-    End
-  internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    type=lsearch key="domain1" opts=NULL
-  file lookup required for domain1
-    in TESTSUITE/aux-fixed/0464.domains
-  creating new cache entry
-  lookup yielded: data for domain1
-  domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains")
- end sublist special_domains
-data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1'
-domain1 in "+special_domains"? yes (matched "+special_domains")
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+   domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="domain1" opts=NULL
+   ╎file lookup required for domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎creating new cache entry
+   ╎lookup yielded: data for domain1
+   ╎domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains")
+  end sublist special_domains
+ data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1'
+ domain1 in "+special_domains"? yes (matched "+special_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
@@ -68,11 +54,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-list element: +special_domains
- start sublist special_domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -92,24 +79,26 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-list element: +special_domains
- start sublist special_domains
-  list element: lsearch;TESTSUITE/aux-fixed/0464.domains
-  search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-    cached open
-  search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-  LRU list:
-    0TESTSUITE/aux-fixed/0464.domains
-    End
-  internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    type=lsearch key="xxx.domain1" opts=NULL
-  file lookup required for xxx.domain1
-    in TESTSUITE/aux-fixed/0464.domains
-  creating new cache entry
-  lookup failed
-  xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
- end sublist special_domains
+xxx.domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎  cached open
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="xxx.domain1" opts=NULL
+   ╎file lookup required for xxx.domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎creating new cache entry
+   ╎lookup failed
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
+  end sublist special_domains
 xxx.domain1 in "+special_domains"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
@@ -129,11 +118,12 @@ routed by r2 router
 require: condition test succeeded in ACL "rcpt"
 processing "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
-list element: +special_domains
- start sublist special_domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying abc@domain1
@@ -144,11 +134,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-list element: +special_domains
- start sublist special_domains
-cached yes match for +special_domains
-cached lookup data = data for domain1
-domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+ cached yes match for +special_domains
+ cached lookup data = data for domain1
+ domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -168,23 +159,25 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-list element: +special_domains
- start sublist special_domains
-  list element: lsearch;TESTSUITE/aux-fixed/0464.domains
-  search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
-    cached open
-  search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
-  LRU list:
-    0TESTSUITE/aux-fixed/0464.domains
-    End
-  internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-    type=lsearch key="xxx.domain1" opts=NULL
-  cached data used for lookup of xxx.domain1
-    in TESTSUITE/aux-fixed/0464.domains
-  lookup failed
-  xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
- end sublist special_domains
+xxx.domain1 in "+special_domains"?
+ list element: +special_domains
+  start sublist special_domains
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
+   ╎list element: lsearch;TESTSUITE/aux-fixed/0464.domains
+   ╎search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
+   ╎  cached open
+   ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎LRU list:
+   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  End
+   ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
+   ╎  type=lsearch key="xxx.domain1" opts=NULL
+   ╎cached data used for lookup of xxx.domain1
+   ╎  in TESTSUITE/aux-fixed/0464.domains
+   ╎lookup failed
+   xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
+  end sublist special_domains
 xxx.domain1 in "+special_domains"? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
diff --git a/test/stderr/0465 b/test/stderr/0465
index 0f9b21efc..bcf5f0393 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -54,22 +38,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -144,22 +112,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/0469 b/test/stderr/0469
index 61ab581f3..948183066 100644
--- a/test/stderr/0469
+++ b/test/stderr/0469
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -34,8 +18,9 @@ local_part=x domain=mxt1c.test.ex
 calling r1 router
 r1 router called for x@mxt1c.test.ex
   domain = mxt1c.test.ex
-list element: *
-mxt1c.test.ex in "*"? yes (matched "*")
+mxt1c.test.ex in "*"?
+ list element: *
+ mxt1c.test.ex in "*"? yes (matched "*")
 DNS lookup of mxt1c.test.ex (MX) using fakens
 DNS lookup of mxt1c.test.ex (MX) succeeded
 DNS lookup of dontqualify (A) using fakens
diff --git a/test/stderr/0471 b/test/stderr/0471
index a669bbe64..9b1482ab7 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -115,16 +99,19 @@ To: random@test.example,
 **** debug string too long - truncated ****
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r1@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r1@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r1@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r1@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r1@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r1@test.ex in "*@*"? yes (matched "*@*")
+ r1@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r1@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r1@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -145,15 +132,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -263,15 +253,18 @@ rewrite headers
     random@test.example,
     random@test.exam
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -449,15 +442,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -634,15 +630,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -819,15 +818,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1004,15 +1006,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1189,15 +1194,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1374,15 +1382,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1559,15 +1570,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1744,15 +1758,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -1929,15 +1946,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -2113,15 +2133,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -2297,15 +2320,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -2481,15 +2507,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -2665,15 +2694,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -2849,15 +2881,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3033,15 +3068,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3217,15 +3255,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3401,15 +3442,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3585,15 +3629,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3769,15 +3816,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -3953,15 +4003,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -4137,15 +4190,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -4321,15 +4377,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -4504,15 +4563,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -4687,15 +4749,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -4870,15 +4935,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5053,15 +5121,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5236,15 +5307,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5419,15 +5493,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5602,15 +5679,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5785,15 +5865,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -5968,15 +6051,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -6151,15 +6237,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -6334,15 +6423,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -6517,15 +6609,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -6699,15 +6794,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -6881,15 +6979,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7063,15 +7164,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7245,15 +7349,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7427,15 +7534,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7609,15 +7719,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7791,15 +7904,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -7973,15 +8089,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -8155,15 +8274,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -8337,15 +8459,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -8519,15 +8644,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -8701,15 +8829,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -8883,15 +9014,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9064,15 +9198,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9245,15 +9382,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9426,15 +9566,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9607,15 +9750,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9788,15 +9934,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -9969,15 +10118,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -10150,15 +10302,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -10331,15 +10486,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -10512,15 +10670,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -10693,15 +10854,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -10874,15 +11038,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11055,15 +11222,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11235,15 +11405,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11415,15 +11588,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11595,15 +11771,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11775,15 +11954,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -11955,15 +12137,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -12135,15 +12320,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -12315,15 +12503,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -12495,15 +12686,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -12675,15 +12869,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -12855,15 +13052,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13035,15 +13235,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13215,15 +13418,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13395,15 +13601,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13574,15 +13783,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13753,15 +13965,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -13932,15 +14147,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -14111,15 +14329,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -14290,15 +14511,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -14469,15 +14693,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -14648,15 +14875,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -14827,15 +15057,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15006,15 +15239,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15184,15 +15420,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15361,15 +15600,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15537,15 +15779,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15712,15 +15957,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -15886,15 +16134,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16059,15 +16310,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16231,15 +16485,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16402,15 +16659,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16572,15 +16832,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16741,15 +17004,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -16909,15 +17175,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17076,15 +17345,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17242,15 +17514,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17407,15 +17682,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17571,15 +17849,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17734,15 +18015,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -17896,15 +18180,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18057,15 +18344,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18217,15 +18507,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18376,15 +18669,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18534,15 +18830,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18691,15 +18990,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -18847,15 +19149,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19002,15 +19307,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19156,15 +19464,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19309,15 +19620,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19461,15 +19775,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19612,15 +19929,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19762,15 +20082,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -19911,15 +20234,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20059,15 +20385,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20206,15 +20535,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20352,15 +20684,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20497,15 +20832,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20641,15 +20979,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20784,15 +21125,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -20926,15 +21270,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21067,15 +21414,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21207,15 +21557,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21346,15 +21699,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21484,15 +21840,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21621,15 +21980,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21757,15 +22119,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -21892,15 +22257,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22026,15 +22394,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22159,15 +22530,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22291,15 +22665,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22422,15 +22799,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22552,15 +22932,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22681,15 +23064,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22809,15 +23195,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -22936,15 +23325,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23062,15 +23454,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23187,15 +23582,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23311,15 +23709,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23434,15 +23835,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23556,15 +23960,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23677,15 +24084,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23797,15 +24207,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -23916,15 +24329,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24034,15 +24450,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24151,15 +24570,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24267,15 +24689,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24382,15 +24807,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24496,15 +24924,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24609,15 +25040,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24721,15 +25155,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24832,15 +25269,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -24942,15 +25382,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25051,15 +25494,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25159,15 +25605,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25266,15 +25715,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25372,15 +25824,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25477,15 +25932,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25581,15 +26039,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25684,15 +26145,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25786,15 +26250,18 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25887,15 +26354,18 @@ To: random@rwtest.example,
 remainder: random@test.example,
     random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -25987,15 +26457,18 @@ To: random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example,
     random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26086,15 +26559,18 @@ To: random@rwtest.example,
     random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example
- list element: ^.{40,}@*
- address match test: subject=random@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ random@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=random@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  random@test.example in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=random@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- random@test.example in "*@*"? yes (matched "*@*")
+ random@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=random@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  random@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26187,15 +26663,18 @@ To: random@rwtest.example,
 remainder: 
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26410,22 +26889,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -26443,16 +26906,19 @@ search_tidyup called
 To: localpart_with_056_chars_56789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r2@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r2@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r2@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r2@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r2@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r2@test.ex in "*@*"? yes (matched "*@*")
+ r2@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r2@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r2@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -26473,15 +26939,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26512,17 +26981,20 @@ rewritten sender = CALLER@myhost.test.ex
 rewrite headers
  rewrite_one_header: type=T:
    To: localpart_with_056_chars_56789012345678901234567890123456@test.example
- list element: ^.{40,}@*
- address match test: subject=localpart_with_056_chars_56789012345678901234567890123456@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
- localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*")
+ localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=localpart_with_056_chars_56789012345678901234567890123456@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
+  localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*")
 LOG: address_rewrite MAIN
   "localpart_with_056_chars_56789012345678901234567890123456@test.example" from to: rewritten as "deny_me@test.example" by rule 1
- list element: *@*
- address match test: subject=deny_me@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- deny_me@test.example in "*@*"? yes (matched "*@*")
+ deny_me@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=deny_me@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  deny_me@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26543,15 +27015,18 @@ To: deny_me@rwtest.example
 remainder: 
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26610,22 +27085,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -26643,16 +27102,19 @@ search_tidyup called
 To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r3@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r3@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r3@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r3@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r3@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r3@test.ex in "*@*"? yes (matched "*@*")
+ r3@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r3@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r3@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -26673,15 +27135,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26712,17 +27177,20 @@ rewritten sender = CALLER@myhost.test.ex
 rewrite headers
  rewrite_one_header: type=T:
    To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
- list element: ^.{40,}@*
- address match test: subject=localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
- localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*")
+ localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
+  localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"? yes (matched "^.{40,}@*")
 LOG: address_rewrite MAIN
   "localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example" from to: rewritten as "deny_me@test.example" by rule 1
- list element: *@*
- address match test: subject=deny_me@test.example pattern=*@*
- list element: *
- test.example in "*"? yes (matched "*")
- deny_me@test.example in "*@*"? yes (matched "*@*")
+ deny_me@test.example in "*@*"?
+  list element: *@*
+  address match test: subject=deny_me@test.example pattern=*@*
+  test.example in "*"?
+   list element: *
+   test.example in "*"? yes (matched "*")
+  deny_me@test.example in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26743,15 +27211,18 @@ To: deny_me@rwtest.example
 remainder: 
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26810,22 +27281,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -26843,16 +27298,19 @@ search_tidyup called
 To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r4@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r4@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r4@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r4@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r4@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r4@test.ex in "*@*"? yes (matched "*@*")
+ r4@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r4@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r4@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -26873,15 +27331,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26916,15 +27377,18 @@ LOG: MAIN
   rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123...
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -26985,22 +27449,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -27018,16 +27466,19 @@ search_tidyup called
 To: undisclosed recpients:;
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r5@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r5@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r5@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r5@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r5@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r5@test.ex in "*@*"? yes (matched "*@*")
+ r5@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r5@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r5@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -27048,15 +27499,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -27089,15 +27543,18 @@ rewrite headers
    To: undisclosed recpients:;
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -27155,22 +27612,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1239
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -27188,16 +27629,19 @@ search_tidyup called
 To: fred@
 
 qualify & rewrite recipients list
- list element: ^.{40,}@*
- address match test: subject=r6@test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' not found in local cache
- compiled RE '^.{40,}@*' saved in local cache
+ r6@test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=r6@test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' not found in local cache
+  compiled RE '^.{40,}@*' saved in local cache
  r6@test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=r6@test.ex pattern=*@*
- list element: *
- test.ex in "*"? yes (matched "*")
- r6@test.ex in "*@*"? yes (matched "*@*")
+ r6@test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=r6@test.ex pattern=*@*
+  test.ex in "*"?
+   list element: *
+   test.ex in "*"? yes (matched "*")
+  r6@test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
     key="test.ex" partial=2 affix=*. starflags=0 opts=NULL
@@ -27218,15 +27662,18 @@ qualify & rewrite recipients list
   creating new cache entry
   lookup failed
 global rewrite rules
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
@@ -27261,15 +27708,18 @@ LOG: MAIN
   rewrite: domain missing or malformed
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
- list element: ^.{40,}@*
- address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
- compiled RE '^.{40,}@*' found in local cache
+ CALLER@myhost.test.ex in "^.{40,}@*"?
+  list element: ^.{40,}@*
+  address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@*
+  compiled RE '^.{40,}@*' found in local cache
  CALLER@myhost.test.ex in "^.{40,}@*"? no (end of list)
- list element: *@*
- address match test: subject=CALLER@myhost.test.ex pattern=*@*
- list element: *
- myhost.test.ex in "*"? yes (matched "*")
- CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
+ CALLER@myhost.test.ex in "*@*"?
+  list element: *@*
+  address match test: subject=CALLER@myhost.test.ex pattern=*@*
+  myhost.test.ex in "*"?
+   list element: *
+   myhost.test.ex in "*"? yes (matched "*")
+  CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
   search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
     cached open
   search_find: file="TESTSUITE/aux-fixed/0471.rw"
diff --git a/test/stderr/0475 b/test/stderr/0475
index a45214d7d..25f85a813 100644
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -6,15 +6,18 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "a1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
->>> list element: 1.2.3.4
->>> list element: <; 1.2.3.4:5.6.7.8
+>>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"?
+>>>  list element: 1.2.3.4
+>>>  list element: <; 1.2.3.4:5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
 >>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
 >>> deny: condition test deferred in ACL "a1"
@@ -22,8 +25,9 @@ LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown looku
 >>> using ACL "a2"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check hosts = 1.2.3/24
->>> list element: 1.2.3/24
->>> host in "1.2.3/24"? no (malformed IPv4 address or address mask)
->>> deny: condition test failed in ACL "a2"
->>> end of ACL "a2": implicit DENY
+>>> host in "1.2.3/24"?
+>>>  list element: 1.2.3/24
+>>>  host in "1.2.3/24"? no (malformed IPv4 address or address mask)
+>>>  deny: condition test failed in ACL "a2"
+>>>  end of ACL "a2": implicit DENY
 LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b>
diff --git a/test/stderr/0479 b/test/stderr/0479
index 9cf1ce072..548466bfa 100644
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -36,12 +20,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
-list element: @
-list element: @[]
+[1.2.3.4] in helo_lookup_domains?
+ list element: @
+ list element: @[]
 [1.2.3.4] in helo_lookup_domains? no (end of list)
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
@@ -61,11 +47,13 @@ LOG: MAIN
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b
-list element: a@b
-address match test: subject=a@b pattern=a@b
-list element: b
-b in "b"? yes (matched "b")
-a@b in "a@b"? yes (matched "a@b")
+a@b in "a@b"?
+ list element: a@b
+ address match test: subject=a@b pattern=a@b
+ b in "b"?
+  list element: b
+  b in "b"? yes (matched "b")
+ a@b in "a@b"? yes (matched "a@b")
 LOG: address_rewrite MAIN
   "a@b" from env-from rewritten as "rewritten-a@rewritten-b" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0480 b/test/stderr/0480
index 07af38e36..26631f87b 100644
--- a/test/stderr/0480
+++ b/test/stderr/0480
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -18,9 +20,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 LOG: failed to expand "${if eq{$received_ip_address}{V4NET.0.0.1}{host.V4NET.0.0.1}{${if eq{$received_ip_address}{V4NET.0.0.2}{}{${if eq{$received_ip_address}{V4NET.0.0.3}{${lookup{x}lsearch{/non/exist}}}fail}}}}}" (smtp_active_hostname): failed to open /non/exist for linear search: No such file or directory
 >>> host in hosts_connection_nolog? no (option unset)
@@ -31,9 +35,11 @@ LOG: failed to expand "${if eq{$received_ip_address}{V4NET.0.0.1}{host.V4NET.0.0
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c in helo_lookup_domains? no (end of list)
 
 ******** SERVER ********
diff --git a/test/stderr/0484 b/test/stderr/0484
index c6a6ce3aa..6b3e2f02f 100644
--- a/test/stderr/0484
+++ b/test/stderr/0484
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/0487 b/test/stderr/0487
index ceb12250a..88ce6aaca 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -3,22 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -35,10 +19,15 @@ LOG: smtp_connection MAIN
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo x.y
+ in limits_advertise_hosts?
+ list element: !*
  in dsn_advertise_hosts? no (option unset)
-list element: *
- in pipelining_advertise_hosts? yes (matched "*")
+ in pipelining_advertise_hosts?
+ list element: *
+  in pipelining_advertise_hosts? yes (matched "*")
+ in chunking_advertise_hosts?
  in chunking_advertise_hosts? no (end of list)
+ in tls_advertise_hosts?
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
        250-SIZE 52428800
        250-8BITMIME
@@ -94,10 +83,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/0499 b/test/stderr/0499
index 6257f319f..8a3733a50 100644
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -32,9 +16,11 @@ routing ph@mxt1.test.ex
 --------> r1 router <--------
 local_part=ph domain=mxt1.test.ex
 checking domains
-list element: +anymx
- start sublist anymx
-  list element: @mx_any
+mxt1.test.ex in "+anymx"?
+ list element: +anymx
+  start sublist anymx
+   mxt1.test.ex in "@mx_any"?
+   ╎list element: @mx_any
 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
@@ -42,14 +28,16 @@ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
-  mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
- end sublist anymx
-data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
-mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+   ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+  end sublist anymx
+ data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
+ mxt1.test.ex in "+anymx"? yes (matched "+anymx")
 checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
- list element: +anymx
-  start sublist anymx
-   list element: @mx_any
+ mxt1.test.ex in "+anymx"?
+  list element: +anymx
+   start sublist anymx
+   ╎mxt1.test.ex in "@mx_any"?
+   ╎ list element: @mx_any
 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
@@ -57,9 +45,9 @@ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
-   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
-  end sublist anymx
- mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+   ╎ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+   end sublist anymx
+  mxt1.test.ex in "+anymx"? yes (matched "+anymx")
 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex
diff --git a/test/stderr/0513 b/test/stderr/0513
index bed9acdf1..97b0e5ad0 100644
--- a/test/stderr/0513
+++ b/test/stderr/0513
@@ -6,22 +6,30 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> a.b.c.d in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> a.b.c.d in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_rcpt"
 >>> processing "defer" (TESTSUITE/test-config 19)
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing x@mxt2.test.ex
 >>> calling r1 router
->>> list element: *
->>> mxt2.test.ex in "*"? yes (matched "*")
+>>> mxt2.test.ex in "*"?
+>>>  list element: *
+>>>  mxt2.test.ex in "*"? yes (matched "*")
 >>> r1 router declined for x@mxt2.test.ex
 >>> no more routers
 >>> ----------- end verify ------------
diff --git a/test/stderr/0514 b/test/stderr/0514
index 0fefb4ff5..8f0b2aeec 100644
--- a/test/stderr/0514
+++ b/test/stderr/0514
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
diff --git a/test/stderr/0524 b/test/stderr/0524
index 157bb70f6..b9a77b346 100644
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -6,29 +6,43 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_mail"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> list element: @
->>> list element: @[]
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_mail"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>>   message: CSA status is $csa_status
@@ -44,14 +58,21 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> csa1.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_mail"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>>   message: CSA status is $csa_status
@@ -59,15 +80,22 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> accept: condition test failed in ACL "check_mail"
 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> list element: @
->>> list element: @[]
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> csa2.test.ex in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "check_mail"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>>   message: CSA status is $csa_status
diff --git a/test/stderr/0534 b/test/stderr/0534
index ca616772f..a9769d283 100644
--- a/test/stderr/0534
+++ b/test/stderr/0534
@@ -9,8 +9,10 @@
 >>> using ACL "two"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check hosts = 5.6.7.8
->>> list element: 5.6.7.8
->>> host in "5.6.7.8"? yes (matched "5.6.7.8")
+>>> host in "5.6.7.8"?
+>>>  list element: 5.6.7.8
+>>>  host in "5.6.7.8"? yes (matched "5.6.7.8")
 >>> accept: condition test succeeded in ACL "two"
 >>> end of ACL "two": ACCEPT
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
diff --git a/test/stderr/0537 b/test/stderr/0537
index 7fbff2329..16e2846f4 100644
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -43,7 +43,8 @@ LOG: sender_ident=
 >>>  end of ACL "log": ACCEPT
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -87,11 +88,17 @@ LOG: sender_ident=ident
 >>>  end of ACL "log": ACCEPT
 >>> accept: condition test succeeded in ACL "connect"
 >>> end of ACL "connect": ACCEPT
->>> list element: 
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> host in limits_advertise_hosts?
+>>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
->>> list element: *
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
+>>> host in tls_advertise_hosts?
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check acl = log
@@ -129,8 +136,9 @@ LOG: sender_ident=ident
 >>>  using ACL "auth"
 >>>  processing "accept" (TESTSUITE/test-config 42)
 >>>  check authenticated = *
->>>  list element: *
->>>  authname in "*"? yes (matched "*")
+>>>  authname in "*"?
+>>>   list element: *
+>>>   authname in "*"? yes (matched "*")
 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"
@@ -174,8 +182,9 @@ LOG: sender_ident=ident
 >>>  using ACL "auth"
 >>>  processing "accept" (TESTSUITE/test-config 42)
 >>>  check authenticated = *
->>>  list element: *
->>>  authname in "*"? yes (matched "*")
+>>>  authname in "*"?
+>>>   list element: *
+>>>   authname in "*"? yes (matched "*")
 >>>  check logwrite = +++ host is authenticated +++
 LOG: +++ host is authenticated +++
 >>>  accept: condition test succeeded in ACL "auth"
diff --git a/test/stderr/0544 b/test/stderr/0544
index 2d9f129c0..942ddcda5 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -1,4 +1,6 @@
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -331,6 +333,8 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 trusted user
@@ -396,6 +400,8 @@ LOG: MAIN
 >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
diff --git a/test/stderr/0545 b/test/stderr/0545
index d391d37f3..94f313af8 100644
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -34,8 +18,9 @@ local_part=userx domain=alias-eximtesthost
 calling dns router
 dns router called for userx@alias-eximtesthost
   domain = alias-eximtesthost
-list element: *
-alias-eximtesthost in "*"? yes (matched "*")
+alias-eximtesthost in "*"?
+ list element: *
+ alias-eximtesthost in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost (MX) using fakens
 DNS lookup of alias-eximtesthost (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -65,8 +50,9 @@ local_part=userx domain=alias-eximtesthost.test.ex
 calling dns router
 dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
-list element: *
-alias-eximtesthost.test.ex in "*"? yes (matched "*")
+alias-eximtesthost.test.ex in "*"?
+ list element: *
+ alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
@@ -94,22 +80,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -127,8 +97,9 @@ local_part=userx domain=alias-eximtesthost.test.ex
 calling dns router
 dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
-list element: *
-alias-eximtesthost.test.ex in "*"? yes (matched "*")
+alias-eximtesthost.test.ex in "*"?
+ list element: *
+ alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
diff --git a/test/stderr/0547 b/test/stderr/0547
index 185b20642..009149810 100644
--- a/test/stderr/0547
+++ b/test/stderr/0547
@@ -6,12 +6,22 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhu.barb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
 LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=...HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,QUIT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -21,12 +31,18 @@ LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=...HELP,RSET,
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> rhu.barb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> list element: *
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
+>>> host in tls_advertise_hosts?
 LOG: SMTP call from (rhu.barb) [10.9.8.7] dropped: too many nonmail commands (last was "HELP")
 LOG: no MAIL in SMTP connection from (rhu.barb) [10.9.8.7] D=qqs C=HELO,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP,HELP,RSET,NOOP
 
diff --git a/test/stderr/0563 b/test/stderr/0563
index d4ff5c5fe..e20d7cc93 100644
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -17,25 +17,29 @@ routing joe-real@testexim.test.ex
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts
-list element: +aliases
- start sublist aliases
-  list element: joe
-  list element: sam
-  list element: tom
-  joe-real in "joe:sam:tom"? no (end of list)
- end sublist aliases
+joe-real in "+aliases"?
+ list element: +aliases
+  start sublist aliases
+   joe-real in "joe:sam:tom"?
+   ╎list element: joe
+   ╎list element: sam
+   ╎list element: tom
+   joe-real in "joe:sam:tom"? no (end of list)
+  end sublist aliases
 joe-real in "+aliases"? no (end of list)
 router1 router skipped: local_parts mismatch
 --------> router2 router <--------
 local_part=joe-real domain=testexim.test.ex
 stripped suffix -real
 checking local_parts
-list element: +aliases
- start sublist aliases
-  list element: joe
-  joe in "joe:sam:tom"? yes (matched "joe")
- end sublist aliases
-joe in "+aliases"? yes (matched "+aliases")
+joe in "+aliases"?
+ list element: +aliases
+  start sublist aliases
+   joe in "joe:sam:tom"?
+   ╎list element: joe
+   ╎joe in "joe:sam:tom"? yes (matched "joe")
+  end sublist aliases
+ joe in "+aliases"? yes (matched "+aliases")
 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex
diff --git a/test/stderr/0569 b/test/stderr/0569
index 7e42184c2..813af1523 100644
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -2,19 +2,23 @@
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
@@ -37,19 +41,23 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
@@ -70,22 +78,27 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
->>> list element: exim.test.ex
->>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
->>> usery@exim.test.ex in "usery@exim.test.ex"? yes (matched "usery@exim.test.ex")
+>>> usery@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
+>>>  exim.test.ex in "exim.test.ex"?
+>>>   list element: exim.test.ex
+>>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
+>>>  usery@exim.test.ex in "usery@exim.test.ex"? yes (matched "usery@exim.test.ex")
 >>> check set acl_m_message = I do not like your message
 >>> accept: condition test succeeded in ACL "check_from"
 >>> end of ACL "check_from": ACCEPT
@@ -104,19 +117,23 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
@@ -137,19 +154,23 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
@@ -172,19 +193,23 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
->>> list element: V4NET.10.10.9
+>>> host in recipient_unqualified_hosts?
+>>>  list element: V4NET.10.10.9
 >>> host in recipient_unqualified_hosts? no (end of list)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
->>> list element: usery@exim.test.ex
+>>> userx@exim.test.ex in "usery@exim.test.ex"?
+>>>  list element: usery@exim.test.ex
 >>> userx@exim.test.ex in "usery@exim.test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 22)
diff --git a/test/stderr/0575 b/test/stderr/0575
index d69944f05..81876ae3d 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -36,12 +20,14 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
+host in pipelining_connect_advertise_hosts?
+ list element: 
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=test)
diff --git a/test/stderr/0584 b/test/stderr/0584
index 64e67748d..3d388bc63 100644
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -6,17 +6,20 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=userx@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
@@ -34,16 +37,19 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=fail@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@test.ex
->>> list element: userx
+>>> fail in "userx"?
+>>>  list element: userx
 >>> fail in "userx"? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
@@ -59,9 +65,11 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
@@ -69,8 +77,9 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende
 >>>              = sender=userx@test.ex/defer_ok
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in "userx"?
+>>>  list element: userx
+>>>  userx in "userx"? yes (matched "userx")
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
diff --git a/test/stderr/0587 b/test/stderr/0587
index 54d98df1b..829ae9adc 100644
--- a/test/stderr/0587
+++ b/test/stderr/0587
@@ -6,16 +6,19 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 14)
 >>> check hosts = test.again.dns
->>> list element: test.again.dns
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>> host in "test.again.dns"?
+>>>  list element: test.again.dns
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns"? list match deferred for test.again.dns
 >>> accept: condition test deferred in inline ACL
 LOG: H=(test) [ip4.ip4.ip4.ip4] F=<ralph@dustyshoes.tld> temporarily rejected RCPT <bob@anotherone.tld>: DNS lookup of "test.again.dns" deferred
diff --git a/test/stderr/0588 b/test/stderr/0588
index 89fc63a61..cb7d945e3 100644
--- a/test/stderr/0588
+++ b/test/stderr/0588
@@ -6,17 +6,20 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_log@delay1500.test.ex
 >>> calling all router
->>> list element: *
->>> delay1500.test.ex in "*"? yes (matched "*")
+>>> delay1500.test.ex in "*"?
+>>>  list element: *
+>>>  delay1500.test.ex in "*"? yes (matched "*")
 LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> local host found for non-MX address
 >>> routed by all router
@@ -31,17 +34,20 @@ LOG: Long A lookup for 'delay1500.test.ex': ssss msec
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing should_not_log@delay500.test.ex
 >>> calling all router
->>> list element: *
->>> delay500.test.ex in "*"? yes (matched "*")
+>>> delay500.test.ex in "*"?
+>>>  list element: *
+>>>  delay500.test.ex in "*"? yes (matched "*")
 >>> local host found for non-MX address
 >>> routed by all router
 >>> ----------- end verify ------------
diff --git a/test/stderr/0618 b/test/stderr/0618
index 587145965..6b4ab92f9 100644
--- a/test/stderr/0618
+++ b/test/stderr/0618
@@ -6,29 +6,35 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> tester in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> tester in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
->>> list element: lsearch;TESTSUITE/aux-fixed/0618.list
->>> fred in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> fred in "lsearch;TESTSUITE/aux-fixed/0618.list"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
+>>>  fred in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0618.list
->>> list element: lsearch;TESTSUITE/aux-fixed/0618.list
->>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
+>>>  good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
 >>> accept: condition test succeeded in ACL "chk_rcpt"
 >>> end of ACL "chk_rcpt": ACCEPT
 LOG: 10HmbA-0005vi-00 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
->>> list element: lsearch;TESTSUITE/aux-fixed/0618.list
->>> jim in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> jim in "lsearch;TESTSUITE/aux-fixed/0618.list"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
+>>>  jim in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0618.list
->>> list element: lsearch;TESTSUITE/aux-fixed/0618.list
->>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
+>>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
+>>>  good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
 >>> accept: condition test succeeded in ACL "chk_rcpt"
 >>> end of ACL "chk_rcpt": ACCEPT
 LOG: 10HmbB-0005vi-00 <= b@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
diff --git a/test/stderr/0620 b/test/stderr/0620
index 5ad58b213..8b11e90f3 100644
--- a/test/stderr/0620
+++ b/test/stderr/0620
@@ -1,4 +1,6 @@
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -52,6 +54,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
diff --git a/test/stderr/0626 b/test/stderr/0626
index 84eacbce6..e34a8f7f0 100644
--- a/test/stderr/0626
+++ b/test/stderr/0626
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -25,9 +27,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -42,9 +46,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -60,9 +66,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -79,9 +87,11 @@ LOG: H=(test) [ip4.ip4.ip4.ip4] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -99,9 +109,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -117,9 +129,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -136,9 +150,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
@@ -156,9 +172,11 @@ LOG: H=(test) [127.0.0.1] F=<tester@test.ex> rejected RCPT <a1@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
 >>> processing "accept" (TESTSUITE/test-config 19)
diff --git a/test/stderr/0628 b/test/stderr/0628
index ce0ca7c11..7bde02185 100644
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -27,10 +27,8 @@
 01:01:01 p1239  macros_trusted overridden to true by whitelisting
 01:01:01 p1239  changed uid/gid: forcing real = effective
 01:01:01 p1239    uid=uuuu gid=EXIM_GID pid=p1239
-01:01:01 p1239  list element: PATH
-01:01:01 p1239  list element: PATH
-01:01:01 p1239  list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-01:01:01 p1239  list element: PATH
+01:01:01 p1239  environment after trimming:
+01:01:01 p1239   PATH=CALLER_HOME/.local/sbin:CALLER_HOME/.local/bin:CALLER_HOME/sbin:CALLER_HOME/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/sbin
 01:01:01 p1239  adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 01:01:01 p1239  configuration file is TESTSUITE/test-config
 01:01:01 p1239  trusted user
diff --git a/test/stderr/0630 b/test/stderr/0630
index f1845d1d7..23b653850 100644
--- a/test/stderr/0630
+++ b/test/stderr/0630
@@ -14,12 +14,13 @@
 01:01:01 p1235   ├──expanding: /$local_part
 01:01:01 p1235   ╰─────result: /dest3
 01:01:01 p1235              ╰──(tainted)
-01:01:01 p1235  list element: /dest3
+01:01:01 p1235  dest3 in "/dest3"?
+01:01:01 p1235   list element: /dest3
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    Tainted filename '/dest3'
 01:01:01 p1235  LOG: MAIN PANIC DIE
 01:01:01 p1235    failed to open /dest3 when checking "/$local_part": Permission denied (euid=uuuu egid=EXIM_GID)
-01:01:01 p1235  search_tidyup called
+01:01:01 p1235   search_tidyup called
 01:01:01 p1235  >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept-delivery) terminating with rc=1 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********
diff --git a/test/stderr/0632 b/test/stderr/0632
index 1df2ef735..49eb5fa89 100644
--- a/test/stderr/0632
+++ b/test/stderr/0632
@@ -1,6 +1,8 @@
 
 ******** SERVER ********
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
diff --git a/test/stderr/0633 b/test/stderr/0633
index 917f2701a..8d92d2ed7 100644
--- a/test/stderr/0633
+++ b/test/stderr/0633
@@ -6,9 +6,11 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> host in pipelining_connect_advertise_hosts?
+>>>  list element: 
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in inline ACL
diff --git a/test/stderr/1007 b/test/stderr/1007
index ee4f88472..ca46d25e6 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -3,31 +3,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -51,31 +26,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -101,31 +51,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -152,31 +77,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -203,31 +103,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -251,31 +126,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1239
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -302,31 +152,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1240
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -354,31 +179,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1241
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/2201 b/test/stderr/2201
index edd4186a4..6566cad54 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -3,31 +3,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/2202 b/test/stderr/2202
index 91674d5b3..3b04a9283 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -134,31 +109,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
diff --git a/test/stderr/2600 b/test/stderr/2600
index e4cff0d3b..2e9995613 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -138,31 +138,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -293,31 +268,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -448,31 +398,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -592,31 +517,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -665,13 +565,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -DOPT=y -C TESTSU
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1239
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/2610 b/test/stderr/2610
index 710057f1f..dd5def7d2 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -231,31 +231,6 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -492,31 +467,6 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -571,13 +521,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1237
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/2620 b/test/stderr/2620
index b631229e7..8ad987d4f 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -217,31 +217,6 @@ close PGSQL connection: localhost:PORT_N/test/CALLER
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -658,31 +633,6 @@ close PGSQL connection: localhost:PORT_N/test/CALLER
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -731,13 +681,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1238
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/3000 b/test/stderr/3000
index 0f4b97105..2dfce2bfb 100644
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -1,5 +1,7 @@
 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25.
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -80,8 +82,6 @@ LOG: smtp_connection MAIN
 >>>  list element: @
 >>>  list element: @[]
 >>> x.y.z in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/3201 b/test/stderr/3201
index 600ea6293..0098e6e4f 100644
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -71,31 +46,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
diff --git a/test/stderr/3208 b/test/stderr/3208
index 0303ae01c..2cdc95c40 100644
--- a/test/stderr/3208
+++ b/test/stderr/3208
@@ -12,8 +12,6 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> remote.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/3210 b/test/stderr/3210
index e6f4fed7a..48dfeaaa3 100644
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/3212 b/test/stderr/3212
index 4be275df2..a0cc58945 100644
--- a/test/stderr/3212
+++ b/test/stderr/3212
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
diff --git a/test/stderr/3400 b/test/stderr/3400
index 1f2d08e6d..3d983bd4d 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -124,8 +124,6 @@ LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -425,8 +423,6 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -581,8 +577,6 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -605,31 +599,6 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -676,8 +645,6 @@ testing.testing in helo_lookup_domains? no (end of list)
 sender_fullhost = (testing.testing) [10.0.0.5]
 sender_rcvhost = [10.0.0.5] (helo=testing.testing ident=CALLER)
 set_process_info: pppp handling incoming connection from (testing.testing) [10.0.0.5] U=CALLER
-host in limits_advertise_hosts?
- list element: !*
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
diff --git a/test/stderr/3408 b/test/stderr/3408
index 09cfd94f6..c4039e6cc 100644
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -12,8 +12,6 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -82,8 +80,6 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/3410 b/test/stderr/3410
index 47b30a628..448c6b969 100644
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -26,8 +26,6 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -82,8 +80,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -124,8 +120,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/3500 b/test/stderr/3500
index 50035a129..244955b10 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -12,8 +12,6 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -46,8 +44,6 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -127,8 +123,6 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/4001 b/test/stderr/4001
index 85a793823..6646220eb 100644
--- a/test/stderr/4001
+++ b/test/stderr/4001
@@ -12,8 +12,6 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> mailserver.test in helo_lookup_domains? no (end of list)
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/5004 b/test/stderr/5004
index 589aad77e..e1cb2a1ea 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -76,13 +51,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/5005 b/test/stderr/5005
index edb62a85c..4a64d0438 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -74,13 +49,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -224,31 +192,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -296,13 +239,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1238
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -448,31 +384,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1240
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -520,13 +431,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1241
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -682,31 +586,6 @@ search_tidyup called
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1243
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -754,13 +633,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1244
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/5006 b/test/stderr/5006
index 6f6cfd04b..4194360f1 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -1,31 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -74,13 +49,6 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=p1235
-PATH in keep_environment?
- list element: PATH
-SSLKEYLOGFILE in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
diff --git a/test/stderr/5204 b/test/stderr/5204
index 002230e4d..5392b0419 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -226,31 +226,6 @@ routed by pm router
   transport: null
 >>>>>>>>>>>>>>>> Exim pid=p1241 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 host in hosts_connection_nolog? no (option unset)
@@ -269,8 +244,6 @@ some.name in helo_lookup_domains?
  list element: @
  list element: @[]
 some.name in helo_lookup_domains? no (end of list)
-host in limits_advertise_hosts?
- list element: !*
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
diff --git a/test/stderr/5403 b/test/stderr/5403
index be89b3e22..9426e4d66 100644
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -13,8 +13,6 @@
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for 1.2.3.4
 LOG: no host name found for IP address 1.2.3.4
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -52,8 +50,6 @@ LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=es
 >>>  myhost.test.ex in helo_lookup_domains? yes (matched "@")
 >>> looking up host name for 1.2.3.4
 LOG: no host name found for IP address 1.2.3.4
->>> host in limits_advertise_hosts?
->>>  list element: !*
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
diff --git a/test/stderr/5410 b/test/stderr/5410
index 9a28e385d..7d0961733 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -1,29 +1,6 @@
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -620,31 +597,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -1194,31 +1148,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
diff --git a/test/stderr/5420 b/test/stderr/5420
index 1a2316cb3..5caa8fcc0 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -1,29 +1,6 @@
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -618,31 +595,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
@@ -1190,31 +1144,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
+environment after trimming:
+ PATH=<munged>
 adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user