Testsuite: GnuTLS version variances

[exim.git] / test / stderr / 0471

diff --git a/test/stderr/0471 b/test/stderr/0471
index 7aecbf1bfa55248de37e7921ea7af28e47122c6b..3a5aa1c7bd0563d531f27ee94754d8d76b7c3391 100644 (file)
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -8,6 +8,8 @@ changed uid/gid: privilege not needed
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 Sender: CALLER@myhost.test.ex
 Recipients:
   r1@test.ex
@@ -96,14 +98,14 @@ To: random@test.example,
  
 **** debug string too long - truncated ****
 
-address match: subject=r1@test.ex pattern=*@*
+address match test: subject=r1@test.ex pattern=*@*
 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
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.ex"
@@ -116,7 +118,7 @@ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
 file lookup required for *.test.ex
   in TESTSUITE/aux-fixed/0471.rw
 lookup failed
-address match: subject=CALLER@myhost.test.ex pattern=*@*
+address match test: subject=CALLER@myhost.test.ex pattern=*@*
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -124,7 +126,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="myhost.test.ex" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="myhost.test.ex"
@@ -225,7 +227,7 @@ rewrite_one_header: type=T:
     random@test.example,
     random@test.examp
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -233,7 +235,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -404,7 +406,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -412,7 +414,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -583,7 +585,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -591,7 +593,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -762,7 +764,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -770,7 +772,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -941,7 +943,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -949,7 +951,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -1120,7 +1122,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1128,7 +1130,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -1299,7 +1301,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1307,7 +1309,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -1478,7 +1480,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1486,7 +1488,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -1657,7 +1659,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1665,7 +1667,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -1836,7 +1838,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -1844,7 +1846,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2014,7 +2016,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2022,7 +2024,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2192,7 +2194,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2200,7 +2202,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2370,7 +2372,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2378,7 +2380,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2548,7 +2550,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2556,7 +2558,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2726,7 +2728,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2734,7 +2736,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -2904,7 +2906,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -2912,7 +2914,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3082,7 +3084,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3090,7 +3092,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3260,7 +3262,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3268,7 +3270,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3438,7 +3440,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3446,7 +3448,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3616,7 +3618,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3624,7 +3626,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3794,7 +3796,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3802,7 +3804,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -3972,7 +3974,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -3980,7 +3982,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -4150,7 +4152,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4158,7 +4160,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -4327,7 +4329,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4335,7 +4337,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -4504,7 +4506,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4512,7 +4514,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -4681,7 +4683,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4689,7 +4691,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -4858,7 +4860,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -4866,7 +4868,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5035,7 +5037,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5043,7 +5045,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5212,7 +5214,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5220,7 +5222,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5389,7 +5391,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5397,7 +5399,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5566,7 +5568,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5574,7 +5576,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5743,7 +5745,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5751,7 +5753,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -5920,7 +5922,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -5928,7 +5930,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6097,7 +6099,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6105,7 +6107,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6274,7 +6276,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6282,7 +6284,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6450,7 +6452,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6458,7 +6460,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6626,7 +6628,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6634,7 +6636,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6802,7 +6804,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6810,7 +6812,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -6978,7 +6980,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -6986,7 +6988,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -7154,7 +7156,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7162,7 +7164,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -7330,7 +7332,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7338,7 +7340,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -7506,7 +7508,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7514,7 +7516,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -7682,7 +7684,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7690,7 +7692,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -7858,7 +7860,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -7866,7 +7868,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8034,7 +8036,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8042,7 +8044,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8210,7 +8212,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8218,7 +8220,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8386,7 +8388,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8394,7 +8396,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8562,7 +8564,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8570,7 +8572,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8737,7 +8739,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8745,7 +8747,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -8912,7 +8914,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -8920,7 +8922,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9087,7 +9089,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9095,7 +9097,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9262,7 +9264,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9270,7 +9272,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9437,7 +9439,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9445,7 +9447,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9612,7 +9614,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9620,7 +9622,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9787,7 +9789,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9795,7 +9797,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -9962,7 +9964,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -9970,7 +9972,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -10137,7 +10139,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10145,7 +10147,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -10312,7 +10314,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10320,7 +10322,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -10487,7 +10489,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10495,7 +10497,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -10662,7 +10664,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10670,7 +10672,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -10836,7 +10838,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -10844,7 +10846,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11010,7 +11012,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11018,7 +11020,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11184,7 +11186,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11192,7 +11194,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11358,7 +11360,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11366,7 +11368,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11532,7 +11534,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11540,7 +11542,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11706,7 +11708,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11714,7 +11716,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -11880,7 +11882,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -11888,7 +11890,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12054,7 +12056,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12062,7 +12064,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12228,7 +12230,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12236,7 +12238,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12402,7 +12404,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12410,7 +12412,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12576,7 +12578,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12584,7 +12586,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12750,7 +12752,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12758,7 +12760,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -12924,7 +12926,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -12932,7 +12934,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13097,7 +13099,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13105,7 +13107,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13270,7 +13272,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13278,7 +13280,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13443,7 +13445,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13451,7 +13453,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13616,7 +13618,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13624,7 +13626,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13789,7 +13791,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13797,7 +13799,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -13962,7 +13964,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -13970,7 +13972,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14135,7 +14137,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14143,7 +14145,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14308,7 +14310,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.exa
 **** debug string too long - truncated ****
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14316,7 +14318,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14481,7 +14483,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14489,7 +14491,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14653,7 +14655,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14661,7 +14663,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14824,7 +14826,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -14832,7 +14834,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -14994,7 +14996,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15002,7 +15004,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15163,7 +15165,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15171,7 +15173,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15331,7 +15333,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15339,7 +15341,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15498,7 +15500,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15506,7 +15508,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15664,7 +15666,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15672,7 +15674,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15829,7 +15831,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -15837,7 +15839,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -15993,7 +15995,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16001,7 +16003,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16156,7 +16158,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16164,7 +16166,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16318,7 +16320,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16326,7 +16328,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16479,7 +16481,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16487,7 +16489,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16639,7 +16641,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16647,7 +16649,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16798,7 +16800,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16806,7 +16808,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -16956,7 +16958,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -16964,7 +16966,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17113,7 +17115,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17121,7 +17123,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17269,7 +17271,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17277,7 +17279,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17424,7 +17426,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17432,7 +17434,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17578,7 +17580,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17586,7 +17588,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17731,7 +17733,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17739,7 +17741,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -17883,7 +17885,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -17891,7 +17893,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18034,7 +18036,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18042,7 +18044,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18184,7 +18186,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18192,7 +18194,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18333,7 +18335,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18341,7 +18343,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18481,7 +18483,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18489,7 +18491,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18628,7 +18630,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18636,7 +18638,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18774,7 +18776,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18782,7 +18784,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -18919,7 +18921,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -18927,7 +18929,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19063,7 +19065,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19071,7 +19073,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19206,7 +19208,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19214,7 +19216,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19348,7 +19350,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19356,7 +19358,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19489,7 +19491,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19497,7 +19499,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19629,7 +19631,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19637,7 +19639,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19768,7 +19770,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19776,7 +19778,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -19906,7 +19908,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -19914,7 +19916,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20043,7 +20045,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20051,7 +20053,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20179,7 +20181,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20187,7 +20189,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20314,7 +20316,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20322,7 +20324,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20448,7 +20450,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20456,7 +20458,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20581,7 +20583,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20589,7 +20591,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20713,7 +20715,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20721,7 +20723,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20844,7 +20846,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20852,7 +20854,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -20974,7 +20976,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -20982,7 +20984,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21103,7 +21105,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21111,7 +21113,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21231,7 +21233,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21239,7 +21241,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21358,7 +21360,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21366,7 +21368,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21484,7 +21486,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21492,7 +21494,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21609,7 +21611,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21617,7 +21619,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21733,7 +21735,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21741,7 +21743,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21856,7 +21858,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21864,7 +21866,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -21978,7 +21980,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -21986,7 +21988,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22099,7 +22101,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22107,7 +22109,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22219,7 +22221,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22227,7 +22229,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22338,7 +22340,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22346,7 +22348,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22456,7 +22458,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22464,7 +22466,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22573,7 +22575,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22581,7 +22583,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22689,7 +22691,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22697,7 +22699,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22804,7 +22806,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22812,7 +22814,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -22918,7 +22920,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -22926,7 +22928,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23031,7 +23033,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23039,7 +23041,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23143,7 +23145,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23151,7 +23153,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23254,7 +23256,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23262,7 +23264,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23364,7 +23366,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23372,7 +23374,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23473,7 +23475,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23481,7 +23483,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23581,7 +23583,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23589,7 +23591,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23688,7 +23690,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23696,7 +23698,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23794,7 +23796,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23802,7 +23804,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -23899,7 +23901,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -23907,7 +23909,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24003,7 +24005,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24011,7 +24013,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24106,7 +24108,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24114,7 +24116,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24208,7 +24210,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24216,7 +24218,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24309,7 +24311,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24317,7 +24319,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24409,7 +24411,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24417,7 +24419,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24508,7 +24510,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24516,7 +24518,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24606,7 +24608,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24614,7 +24616,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24703,7 +24705,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24711,7 +24713,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24799,7 +24801,7 @@ remainder: random@test.example,
     random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24807,7 +24809,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24894,7 +24896,7 @@ To: random@rwtest.example,
 remainder: random@test.example,
     random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24902,7 +24904,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -24988,7 +24990,7 @@ To: random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example,
     random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -24996,7 +24998,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -25081,7 +25083,7 @@ To: random@rwtest.example,
     random@rwtest.example,
 **** debug string too long - truncated ****
 remainder: random@test.example
-address match: subject=random@test.example pattern=*@*
+address match test: subject=random@test.example pattern=*@*
 test.example in "*"? yes (matched "*")
 random@test.example in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -25089,7 +25091,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="test.example" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="test.example"
@@ -25176,7 +25178,7 @@ To: random@rwtest.example,
 remainder: 
 rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@myhost.test.ex>
-address match: subject=CALLER@myhost.test.ex pattern=*@*
+address match test: subject=CALLER@myhost.test.ex pattern=*@*
 myhost.test.ex in "*"? yes (matched "*")
 CALLER@myhost.test.ex in "*@*"? yes (matched "*@*")
 search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
@@ -25184,7 +25186,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
 search_find: file="TESTSUITE/aux-fixed/0471.rw"
   key="myhost.test.ex" partial=2 affix=*. starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0471.rw
+  0TESTSUITE/aux-fixed/0471.rw
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
   type=lsearch key="myhost.test.ex"
@@ -25205,8 +25207,6 @@ cached data used for lookup of *.test.ex
 lookup failed
 search_tidyup called
 >>Headers after rewriting and local additions:
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 * To: random@test.example,
     random@test.example,
     random@test.example,
@@ -25368,18 +25368,22 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
-Writing spool header file
+Writing spool header file: TESTSUITE/spool//input//hdr.pppp
+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |r1@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>