From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 11 Jul 2019 10:58:07 +0000 (+0100)
Subject: Debug: indent lookup operations
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/42c7f0b4ea09d8971a19beeef743ec8981d4aacc?hp=17ccbda62e05f6ed59a27791643be4b94f7fcdbd

Debug: indent lookup operations
---

diff --git a/src/src/lookups/cdb.c b/src/src/lookups/cdb.c
index 7c738eb7e..13fe8b7d2 100644
--- a/src/src/lookups/cdb.c
+++ b/src/src/lookups/cdb.c
@@ -210,13 +210,12 @@ cdb_open(uschar *filename,
 
     /* Now return the state struct */
     return(cdbp);
-  } else {
+  } else
     /* If we got here the map failed.  Basically we can ignore
      * this since we fall back to slower methods....
      * However lets debug log it...
      */
-    DEBUG(D_lookup) debug_printf("cdb mmap failed - %d\n", errno);
-  }
+    DEBUG(D_lookup) debug_printf_indent("cdb mmap failed - %d\n", errno);
 #endif /* HAVE_MMAP */
 
   /* In this case we have either not got MMAP allowed, or it failed */
@@ -318,7 +317,7 @@ if ((hash_offset + (hash_offlen * CDB_HASH_ENTRY)) > cdbp->filelen)
   {
   *errmsg = string_sprintf("cdb: corrupt cdb file %s (too short)",
 		      filename);
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return DEFER;
   }
 
diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index 9e3d68e33..bdc002d4e 100644
--- a/src/src/lookups/dbmdb.c
+++ b/src/src/lookups/dbmdb.c
@@ -199,7 +199,7 @@ if (key_p == key_buffer)
 empty element to put one in. Boundary: key length 1, is a NULL */
 key_item_len = key_p - key_buffer - 1;
 
-DEBUG(D_lookup) debug_printf("NUL-joined key length: %d\n", key_item_len);
+DEBUG(D_lookup) debug_printf_indent("NUL-joined key length: %d\n", key_item_len);
 
 /* beware that dbmdb_find() adds 1 to length to get back terminating NUL, so
 because we've calculated the real length, we need to subtract one more here */
diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index aea2eba72..70203fa6d 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -332,7 +332,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
 
   do
     {
-    DEBUG(D_lookup) debug_printf("dnsdb key: %s\n", domain);
+    DEBUG(D_lookup) debug_printf_indent("dnsdb key: %s\n", domain);
 
     /* Do the lookup and sort out the result. There are four special types that
     are handled specially: T_CSA, T_ZNS, T_ADDRESSES and T_MXH.
diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index 5ae966611..eab3c6ad8 100644
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -51,7 +51,7 @@ static void ibase_tidy(void)
 
     while ((cn = ibase_connections) != NULL) {
         ibase_connections = cn->next;
-        DEBUG(D_lookup) debug_printf("close Interbase connection: %s\n",
+        DEBUG(D_lookup) debug_printf_indent("close Interbase connection: %s\n",
                                      cn->server);
         isc_commit_transaction(status, &cn->transh);
         isc_detach_database(status, &cn->dbh);
@@ -170,10 +170,8 @@ if (cn)
     isc_detach_database(status, &cn->dbh);
     }
   else
-    {
-    DEBUG(D_lookup) debug_printf("Interbase using cached connection for %s\n",
+    DEBUG(D_lookup) debug_printf_indent("Interbase using cached connection for %s\n",
 		     server_copy);
-    }
   }
 else
   {
@@ -210,7 +208,7 @@ if (cn->dbh == NULL || cn->transh == NULL)
   dpb_length = dpb - buffer;
 
   DEBUG(D_lookup)
-      debug_printf("new Interbase connection: database=%s user=%s\n",
+      debug_printf_indent("new Interbase connection: database=%s user=%s\n",
 		   sdata[0], sdata[1]);
 
   /* Connect to the database */
@@ -432,7 +430,7 @@ if (result)
   }
 else
   {
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return yield;           /* FAIL or DEFER */
   }
 }
@@ -460,7 +458,7 @@ ibase_find(void *handle, uschar * filename, uschar * query, int length,
     /* Keep picky compilers happy */
     do_cache = do_cache;
 
-    DEBUG(D_lookup) debug_printf("Interbase query: %s\n", query);
+    DEBUG(D_lookup) debug_printf_indent("Interbase query: %s\n", query);
 
     while ((server =
             string_nextinlist(&list, &sep, buffer,
diff --git a/src/src/lookups/json.c b/src/src/lookups/json.c
index 0b28b731e..a02b7b9bd 100644
--- a/src/src/lookups/json.c
+++ b/src/src/lookups/json.c
@@ -108,7 +108,7 @@ for (int k = 1;  (key = string_nextinlist(&keystring, &sep, NULL, 0)); k++)
 	: json_object_get(j, CCS key)
      ) )
     {
-    DEBUG(D_lookup) debug_printf("%s, for key %d: '%s'\n",
+    DEBUG(D_lookup) debug_printf_indent("%s, for key %d: '%s'\n",
       numeric
       ? US"bad index, or not json array"
       : US"no such key, or not json object",
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 08f68b75e..97ee188d2 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -163,8 +163,8 @@ int    rescount = 0;
 BOOL   attribute_found = FALSE;
 BOOL   ldapi = FALSE;
 
-DEBUG(D_lookup)
-  debug_printf("perform_ldap_search: ldap%s URL = \"%s\" server=%s port=%d "
+DEBUG(D_lookup) debug_printf_indent("perform_ldap_search:"
+    " ldap%s URL = \"%s\" server=%s port=%d "
     "sizelimit=%d timelimit=%d tcplimit=%d\n",
     search_type == SEARCH_LDAP_MULTIPLE ? "m" :
     search_type == SEARCH_LDAP_DN       ? "dn" :
@@ -207,7 +207,7 @@ else
   port = ludp->lud_port;
   }
 
-DEBUG(D_lookup) debug_printf("after ldap_url_parse: host=%s port=%d\n",
+DEBUG(D_lookup) debug_printf_indent("after ldap_url_parse: host=%s port=%d\n",
   host, port);
 
 if (port == 0) port = LDAP_PORT;      /* Default if none given */
@@ -334,7 +334,7 @@ if (!lcp)
 
   /* Call ldap_initialize() and check the result */
 
-  DEBUG(D_lookup) debug_printf("ldap_initialize with URL %s\n", init_url);
+  DEBUG(D_lookup) debug_printf_indent("ldap_initialize with URL %s\n", init_url);
   if ((rc = ldap_initialize(&ld, CS init_url)) != LDAP_SUCCESS)
     {
     *errmsg = string_sprintf("ldap_initialize: (error %d) URL \"%s\"\n",
@@ -409,7 +409,7 @@ if (!lcp)
   ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, (void *)&eldap_version);
 #endif
 
-  DEBUG(D_lookup) debug_printf("initialized for LDAP (v%d) server %s%s\n",
+  DEBUG(D_lookup) debug_printf_indent("initialized for LDAP (v%d) server %s%s\n",
     eldap_version, host, porttext);
 
   /* If not using ldapi and TLS is available, set appropriate TLS options: hard
@@ -429,9 +429,9 @@ if (!lcp)
 	: Ustrcmp(eldap_require_cert, "try")    == 0 ? LDAP_OPT_X_TLS_TRY
 	: LDAP_OPT_X_TLS_NEVER;
 
-      DEBUG(D_lookup)
-        debug_printf("Require certificate overrides LDAP_OPT_X_TLS option (%d)\n",
-                     tls_option);
+      DEBUG(D_lookup) debug_printf_indent(
+	"Require certificate overrides LDAP_OPT_X_TLS option (%d)\n",
+	tls_option);
       }
     else
 # endif  /* LDAP_OPT_X_TLS_REQUIRE_CERT */
@@ -439,13 +439,13 @@ if (!lcp)
       {
       tls_option = LDAP_OPT_X_TLS_HARD;
       DEBUG(D_lookup)
-        debug_printf("LDAP_OPT_X_TLS_HARD set due to ldaps:// URI\n");
+        debug_printf_indent("LDAP_OPT_X_TLS_HARD set due to ldaps:// URI\n");
       }
     else
       {
       tls_option = LDAP_OPT_X_TLS_TRY;
       DEBUG(D_lookup)
-        debug_printf("LDAP_OPT_X_TLS_TRY set due to ldap:// URI\n");
+        debug_printf_indent("LDAP_OPT_X_TLS_TRY set due to ldap:// URI\n");
       }
     ldap_set_option(ld, LDAP_OPT_X_TLS, (void *)&tls_option);
     }
@@ -488,14 +488,14 @@ if (!lcp)
     rc = ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_REQUIRE_CERT, &cert_option);
     if (rc)
       DEBUG(D_lookup)
-        debug_printf("Unable to set TLS require cert_option(%d) globally: %s\n",
+        debug_printf_indent("Unable to set TLS require cert_option(%d) globally: %s\n",
           cert_option, ldap_err2string(rc));
     }
 #endif
 #ifdef LDAP_OPT_X_TLS_NEWCTX
   if ((rc = ldap_set_option(ldsetctx, LDAP_OPT_X_TLS_NEWCTX, &am_server)))
     DEBUG(D_lookup)
-      debug_printf("Unable to reload TLS context %d: %s\n",
+      debug_printf_indent("Unable to reload TLS context %d: %s\n",
                    rc, ldap_err2string(rc));
   #endif
 
@@ -517,7 +517,7 @@ if (!lcp)
 
 else
   DEBUG(D_lookup)
-    debug_printf("re-using cached connection to LDAP server %s%s\n",
+    debug_printf_indent("re-using cached connection to LDAP server %s%s\n",
       host, porttext);
 
 /* Bind with the user/password supplied, or an anonymous bind if these values
@@ -532,7 +532,7 @@ if (  !lcp->bound
    || lcp->password && password && Ustrcmp(lcp->password, password) != 0
    )
   {
-  DEBUG(D_lookup) debug_printf("%sbinding with user=%s password=%s\n",
+  DEBUG(D_lookup) debug_printf_indent("%sbinding with user=%s password=%s\n",
     lcp->bound ? "re-" : "", user, password);
 
   if (eldap_start_tls && !lcp->is_start_tls_called && !ldapi)
@@ -551,7 +551,7 @@ if (  !lcp->bound
       }
     lcp->is_start_tls_called = TRUE;
 #else
-    DEBUG(D_lookup) debug_printf("TLS initiation not supported with this Exim"
+    DEBUG(D_lookup) debug_printf_indent("TLS initiation not supported with this Exim"
       " and your LDAP library.\n");
 #endif
     }
@@ -580,7 +580,7 @@ if (  !lcp->bound
   if (search_type == SEARCH_LDAP_AUTH && rc == LDAP_INVALID_CREDENTIALS)
     {
     DEBUG(D_lookup)
-      debug_printf("Invalid credentials: ldapauth returns FAIL\n");
+      debug_printf_indent("Invalid credentials: ldapauth returns FAIL\n");
     error_yield = FAIL;
     goto RETURN_ERROR_NOMSG;
     }
@@ -609,7 +609,7 @@ if (  !lcp->bound
 
 if (search_type == SEARCH_LDAP_AUTH)
   {
-  DEBUG(D_lookup) debug_printf("Bind succeeded: ldapauth returns OK\n");
+  DEBUG(D_lookup) debug_printf_indent("Bind succeeded: ldapauth returns OK\n");
   goto RETURN_OK;
   }
 
@@ -641,7 +641,7 @@ ldap_set_option(lcp->ld, LDAP_OPT_REFERRALS, referrals);
 
 /* Start the search on the server. */
 
-DEBUG(D_lookup) debug_printf("Start search\n");
+DEBUG(D_lookup) debug_printf_indent("Start search\n");
 
 msgid = ldap_search(lcp->ld, ludp->lud_dn, ludp->lud_scope, ludp->lud_filter,
   ludp->lud_attrs, 0);
@@ -673,7 +673,7 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
                     then we get two entries, one for A and one for B.
                     Here we just count the values per entry */
 
-  DEBUG(D_lookup) debug_printf("LDAP result loop\n");
+  DEBUG(D_lookup) debug_printf_indent("LDAP result loop\n");
 
   for(e = ldap_first_entry(lcp->ld, result), valuecount = 0;
       e;
@@ -682,7 +682,7 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
     uschar *new_dn;
     BOOL insert_space = FALSE;
 
-    DEBUG(D_lookup) debug_printf("LDAP entry loop\n");
+    DEBUG(D_lookup) debug_printf_indent("LDAP entry loop\n");
 
     rescount++;   /* Count results */
 
@@ -731,7 +731,7 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
     else for (uschar * attr = US ldap_first_attribute(lcp->ld, e, &ber);
               attr; attr = US ldap_next_attribute(lcp->ld, e, ber))
       {
-      DEBUG(D_lookup) debug_printf("LDAP attr loop\n");
+      DEBUG(D_lookup) debug_printf_indent("LDAP attr loop\n");
 
       /* In case of attrs_requested == 1 we just count the values, in all other cases
       (0, >1) we count the values per attribute */
@@ -759,7 +759,7 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
             int len = Ustrlen(value);
             ++valuecount;
 
-            DEBUG(D_lookup) debug_printf("LDAP value loop %s:%s\n", attr, value);
+            DEBUG(D_lookup) debug_printf_indent("LDAP value loop %s:%s\n", attr, value);
 
             /* In case we requested one attribute only but got several times
             into that attr loop, we need to append the additional values.
@@ -852,7 +852,7 @@ if (dn)
 #endif
   }
 
-DEBUG(D_lookup) debug_printf("search ended by ldap_result yielding %d\n",rc);
+DEBUG(D_lookup) debug_printf_indent("search ended by ldap_result yielding %d\n",rc);
 
 if (rc == 0)
   {
@@ -874,7 +874,7 @@ methods of handling error codes and generating error messages. */
 if (rc == -1 || !result)
   {
   int err;
-  DEBUG(D_lookup) debug_printf("ldap_result failed\n");
+  DEBUG(D_lookup) debug_printf_indent("ldap_result failed\n");
 
 #if defined LDAP_LIB_SOLARIS || defined LDAP_LIB_OPENLDAP2
     ldap_get_option(lcp->ld, LDAP_OPT_ERROR_NUMBER, &err);
@@ -917,7 +917,7 @@ We need to parse the message to find out exactly what's happened. */
   ldap_rc = rc;
   ldap_parse_rc = ldap_parse_result(lcp->ld, result, &rc, CSS &matched,
     CSS &error2, NULL, NULL, 0);
-  DEBUG(D_lookup) debug_printf("ldap_parse_result: %d\n", ldap_parse_rc);
+  DEBUG(D_lookup) debug_printf_indent("ldap_parse_result: %d\n", ldap_parse_rc);
   if (ldap_parse_rc < 0 &&
       (ldap_parse_rc != LDAP_NO_RESULTS_RETURNED
       #ifdef LDAP_RES_SEARCH_REFERENCE
@@ -959,7 +959,7 @@ We need to parse the message to find out exactly what's happened. */
       the lookup, so return DEFER (which is the default in error_yield).
 */
 
-DEBUG(D_lookup) debug_printf("ldap_parse_result yielded %d: %s\n",
+DEBUG(D_lookup) debug_printf_indent("ldap_parse_result yielded %d: %s\n",
   rc, ldap_err2string(rc));
 
 if (rc != LDAP_SUCCESS && rc != LDAP_SIZELIMIT_EXCEEDED
@@ -985,7 +985,7 @@ if (rc != LDAP_SUCCESS && rc != LDAP_SIZELIMIT_EXCEEDED
 #endif
 
     {
-    DEBUG(D_lookup) debug_printf("lookup failure forced\n");
+    DEBUG(D_lookup) debug_printf_indent("lookup failure forced\n");
     error_yield = FAIL;
     }
   goto RETURN_ERROR;
@@ -1021,7 +1021,7 @@ if (!attribute_found)
 
 /* Otherwise, it's all worked */
 
-DEBUG(D_lookup) debug_printf("LDAP search: returning: %s\n", data->s);
+DEBUG(D_lookup) debug_printf_indent("LDAP search: returning: %s\n", data->s);
 *res = data->s;
 
 RETURN_OK:
@@ -1035,7 +1035,7 @@ RETURN_ERROR_BREAK:
 *defer_break = TRUE;
 
 RETURN_ERROR:
-DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
 
 RETURN_ERROR_NOMSG:
 if (result) ldap_msgfree(result);
@@ -1144,7 +1144,7 @@ while (strncmpic(url, US"ldap", 4) != 0)
         {
         *errmsg = string_sprintf("LDAP_OP_DEREF not defined in this LDAP "
           "library - cannot use \"dereference\"");
-        DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+        DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
         return DEFER;
         }
       #endif
@@ -1156,9 +1156,7 @@ while (strncmpic(url, US"ldap", 4) != 0)
         else if (strcmpic(value, US"nofollow") == 0) referrals = LDAP_OPT_OFF;
         else
           {
-          *errmsg = string_sprintf("LDAP option REFERRALS is not \"follow\" "
-            "or \"nofollow\"");
-          DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+          DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
           return DEFER;
           }
         }
@@ -1167,7 +1165,7 @@ while (strncmpic(url, US"ldap", 4) != 0)
         {
         *errmsg = string_sprintf("LDAP_OP_REFERRALS not defined in this LDAP "
           "library - cannot use \"referrals\"");
-        DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+        DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
         return DEFER;
         }
       #endif
@@ -1177,7 +1175,7 @@ while (strncmpic(url, US"ldap", 4) != 0)
         *errmsg =
           string_sprintf("unknown parameter \"%.*s\" precedes LDAP URL",
             namelen, name);
-        DEBUG(D_lookup) debug_printf("LDAP query error: %s\n", *errmsg);
+        DEBUG(D_lookup) debug_printf_indent("LDAP query error: %s\n", *errmsg);
         return DEFER;
         }
       while (isspace(*url)) url++;
@@ -1185,7 +1183,7 @@ while (strncmpic(url, US"ldap", 4) != 0)
       }
     }
   *errmsg = US"malformed parameter setting precedes LDAP URL";
-  DEBUG(D_lookup) debug_printf("LDAP query error: %s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("LDAP query error: %s\n", *errmsg);
   return DEFER;
   }
 
@@ -1216,7 +1214,7 @@ if (user != NULL)
   }
 
 DEBUG(D_lookup)
-  debug_printf("LDAP parameters: user=%s pass=%s size=%d time=%d connect=%d "
+  debug_printf_indent("LDAP parameters: user=%s pass=%s size=%d time=%d connect=%d "
     "dereference=%d referrals=%s\n", user, password, sizelimit, timelimit,
     tcplimit, dereference, (referrals == LDAP_OPT_ON)? "on" : "off");
 
@@ -1233,7 +1231,7 @@ if (search_type == SEARCH_LDAP_AUTH)
     }
   if (password[0] == 0)
     {
-    DEBUG(D_lookup) debug_printf("Empty password: ldapauth returns FAIL\n");
+    DEBUG(D_lookup) debug_printf_indent("Empty password: ldapauth returns FAIL\n");
     return FAIL;
     }
   }
@@ -1246,7 +1244,7 @@ if (Ustrncmp(p, "://", 3) != 0)
   {
   *errmsg = string_sprintf("LDAP URL does not start with \"ldap://\", "
     "\"ldaps://\", or \"ldapi://\" (it starts with \"%.16s...\")", url);
-  DEBUG(D_lookup) debug_printf("LDAP query error: %s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("LDAP query error: %s\n", *errmsg);
   return DEFER;
   }
 
@@ -1358,7 +1356,7 @@ eldap_dn = NULL;
 
 while ((lcp = ldap_connections) != NULL)
   {
-  DEBUG(D_lookup) debug_printf("unbind LDAP connection to %s:%d\n", lcp->host,
+  DEBUG(D_lookup) debug_printf_indent("unbind LDAP connection to %s:%d\n", lcp->host,
     lcp->port);
   if(lcp->bound == TRUE)
     ldap_unbind(lcp->ld);
diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c
index 99663073b..cc894e0ed 100644
--- a/src/src/lookups/lf_sqlperform.c
+++ b/src/src/lookups/lf_sqlperform.c
@@ -45,7 +45,7 @@ const uschar *serverlist;
 uschar buffer[512];
 BOOL defer_break = FALSE;
 
-DEBUG(D_lookup) debug_printf("%s query: %s\n", name, query);
+DEBUG(D_lookup) debug_printf_indent("%s query: %s\n", name, query);
 
 /* Handle queries that do not have server information at the start. */
 
diff --git a/src/src/lookups/lmdb.c b/src/src/lookups/lmdb.c
index efaa71f89..931ea5bbe 100644
--- a/src/src/lookups/lmdb.c
+++ b/src/src/lookups/lmdb.c
@@ -85,24 +85,24 @@ Lmdbstrct * lmdb_p = handle;
 dbkey.mv_data = CS keystring;
 dbkey.mv_size = length;
 
-DEBUG(D_lookup) debug_printf("LMDB: lookup key: %s\n", CS keystring);
+DEBUG(D_lookup) debug_printf_indent("LMDB: lookup key: %s\n", CS keystring);
 
 if ((ret = mdb_get(lmdb_p->txn, lmdb_p->db_dbi, &dbkey, &data)) == 0)
   {
   *result = string_copyn(US data.mv_data, data.mv_size);
-  DEBUG(D_lookup) debug_printf("LMDB: lookup result: %s\n", *result);
+  DEBUG(D_lookup) debug_printf_indent("LMDB: lookup result: %s\n", *result);
   return OK;
   }
 else if (ret == MDB_NOTFOUND)
   {
   *errmsg = US"LMDB: lookup, no data found";
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return FAIL;
   }
 else
   {
   *errmsg = string_sprintf("LMDB: lookup error: %s", mdb_strerror(ret));
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return DEFER;
   }
 }
diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index ba8ecba11..1984e30b2 100644
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -101,7 +101,7 @@ mysql_connection *cn;
 while ((cn = mysql_connections) != NULL)
   {
   mysql_connections = cn->next;
-  DEBUG(D_lookup) debug_printf("close MYSQL connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close MYSQL connection: %s\n", cn->server);
   mysql_close(cn->handle);
   }
 }
@@ -227,7 +227,7 @@ if (!cn)
   if (sdata[1][0] == 0) sdata[1] = NULL;
 
   DEBUG(D_lookup)
-    debug_printf("MYSQL new connection: host=%s port=%d socket=%s "
+    debug_printf_indent("MYSQL new connection: host=%s port=%d socket=%s "
       "database=%s user=%s\n", sdata[0], port, socket, sdata[1], sdata[2]);
 
   /* Get store for a new handle, initialize it, and connect to the server */
@@ -260,7 +260,7 @@ if (!cn)
 else
   {
   DEBUG(D_lookup)
-    debug_printf("MYSQL using cached connection for %s\n", server_copy);
+    debug_printf_indent("MYSQL using cached connection for %s\n", server_copy);
   }
 
 /* Run the query */
@@ -285,7 +285,7 @@ if (!(mysql_result = mysql_use_result(mysql_handle)))
   {
   if ( mysql_field_count(mysql_handle) == 0 )
     {
-    DEBUG(D_lookup) debug_printf("MYSQL: query was not one that returns data\n");
+    DEBUG(D_lookup) debug_printf_indent("MYSQL: query was not one that returns data\n");
     result = string_cat(result,
 	       string_sprintf("%d", mysql_affected_rows(mysql_handle)));
     *do_cache = 0;
@@ -331,7 +331,7 @@ while((i = mysql_next_result(mysql_handle)) >= 0)
   {
   if(i == 0)	/* Just ignore more results */
     {
-    DEBUG(D_lookup) debug_printf("MYSQL: got unexpected more results\n");
+    DEBUG(D_lookup) debug_printf_indent("MYSQL: got unexpected more results\n");
     continue;
     }
 
@@ -371,7 +371,7 @@ if (result)
   }
 else
   {
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return yield;      /* FAIL or DEFER */
   }
 }
diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index d57314580..d106c519f 100644
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -216,7 +216,7 @@ oracle_connection *cn;
 while ((cn = oracle_connections) != NULL)
   {
   oracle_connections = cn->next;
-  DEBUG(D_lookup) debug_printf("close ORACLE connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close ORACLE connection: %s\n", cn->server);
   ologof(cn->handle);
   }
 }
@@ -300,7 +300,7 @@ for (cn = oracle_connections; cn; cn = cn->next)
 
 if (!cn)
   {
-  DEBUG(D_lookup) debug_printf("ORACLE new connection: host=%s database=%s "
+  DEBUG(D_lookup) debug_printf_indent("ORACLE new connection: host=%s database=%s "
     "user=%s\n", sdata[0], sdata[1], sdata[2]);
 
   /* Get store for a new connection, initialize it, and connect to the server */
@@ -343,7 +343,7 @@ to obliterate the password because it is in a nextinlist temporary buffer. */
 else
   {
   DEBUG(D_lookup)
-    debug_printf("ORACLE using cached connection for %s\n", server_copy);
+    debug_printf_indent("ORACLE using cached connection for %s\n", server_copy);
   }
 
 /* We have a connection. Open a cursor and run the query */
@@ -486,7 +486,7 @@ if (result)
   }
 else
   {
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return yield;      /* FAIL or DEFER */
   }
 }
@@ -513,7 +513,7 @@ uschar buffer[512];
 
 do_cache = do_cache;   /* Placate picky compilers */
 
-DEBUG(D_lookup) debug_printf("ORACLE query: %s\n", query);
+DEBUG(D_lookup) debug_printf_indent("ORACLE query: %s\n", query);
 
 while ((server = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
   {
diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index cc12e40d7..cf1e1743e 100644
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -53,7 +53,7 @@ pgsql_connection *cn;
 while ((cn = pgsql_connections) != NULL)
   {
   pgsql_connections = cn->next;
-  DEBUG(D_lookup) debug_printf("close PGSQL connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close PGSQL connection: %s\n", cn->server);
   PQfinish(cn->handle);
   }
 }
@@ -77,7 +77,7 @@ static void
 notice_processor(void *arg, const char *message)
 {
 arg = arg;   /* Keep compiler happy */
-DEBUG(D_lookup) debug_printf("PGSQL: %s\n", message);
+DEBUG(D_lookup) debug_printf_indent("PGSQL: %s\n", message);
 }
 
 
@@ -181,7 +181,7 @@ if (!cn)
     last_slash = Ustrrchr(server, '/');
     last_dot = Ustrrchr(server, '.');
 
-    DEBUG(D_lookup) debug_printf("PGSQL new connection: socket=%s "
+    DEBUG(D_lookup) debug_printf_indent("PGSQL new connection: socket=%s "
       "database=%s user=%s\n", server, sdata[0], sdata[1]);
 
     /* A valid socket name looks like this: /var/run/postgresql/.s.PGSQL.5432
@@ -221,7 +221,7 @@ if (!cn)
       return DEFER;
       }
 
-    DEBUG(D_lookup) debug_printf("PGSQL new connection: host=%s port=%s "
+    DEBUG(D_lookup) debug_printf_indent("PGSQL new connection: host=%s port=%s "
       "database=%s user=%s\n", server, port, sdata[0], sdata[1]);
     }
 
@@ -270,7 +270,7 @@ if (!cn)
 
 else
   {
-  DEBUG(D_lookup) debug_printf("PGSQL using cached connection for %s\n",
+  DEBUG(D_lookup) debug_printf_indent("PGSQL using cached connection for %s\n",
     server_copy);
   }
 
@@ -288,7 +288,7 @@ switch(PQresultStatus(pg_result))
 
     result = string_cat(result, US PQcmdTuples(pg_result));
     *do_cache = 0;
-    DEBUG(D_lookup) debug_printf("PGSQL: command does not return any data "
+    DEBUG(D_lookup) debug_printf_indent("PGSQL: command does not return any data "
       "but was successful. Rows affected: %s\n", string_from_gstring(result));
     break;
 
@@ -362,7 +362,7 @@ if (result)
   }
 else
   {
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return yield;      /* FAIL or DEFER */
   }
 }
diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
index e84f76675..6de675787 100644
--- a/src/src/lookups/redis.c
+++ b/src/src/lookups/redis.c
@@ -47,7 +47,7 @@ redis_connection *cn;
 while ((cn = redis_connections))
   {
   redis_connections = cn->next;
-  DEBUG(D_lookup) debug_printf("close REDIS connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close REDIS connection: %s\n", cn->server);
   redisFree(cn->handle);
   }
 }
@@ -154,7 +154,7 @@ if (!cn)
     }
 
   DEBUG(D_lookup)
-    debug_printf("REDIS new connection: host=%s port=%d socket=%s database=%s\n",
+    debug_printf_indent("REDIS new connection: host=%s port=%d socket=%s database=%s\n",
       sdata[0], port, socket, sdata[1]);
 
   /* Get store for a new handle, initialize it, and connect to the server */
@@ -178,7 +178,7 @@ if (!cn)
 else
   {
   DEBUG(D_lookup)
-    debug_printf("REDIS using cached connection for %s\n", server_copy);
+    debug_printf_indent("REDIS using cached connection for %s\n", server_copy);
 }
 
 /* Authenticate if there is a password */
@@ -199,7 +199,7 @@ if(sdata[1])
     *defer_break = FALSE;
     goto REDIS_EXIT;
     }
-  DEBUG(D_lookup) debug_printf("REDIS: Selecting database=%s\n", sdata[1]);
+  DEBUG(D_lookup) debug_printf_indent("REDIS: Selecting database=%s\n", sdata[1]);
   }
 
 /* split string on whitespace into argv */
@@ -220,7 +220,7 @@ if(sdata[1])
 	g = string_catn(g, s, 1);
     argv[i] = string_from_gstring(g);
 
-    DEBUG(D_lookup) debug_printf("REDIS: argv[%d] '%s'\n", i, argv[i]);
+    DEBUG(D_lookup) debug_printf_indent("REDIS: argv[%d] '%s'\n", i, argv[i]);
     while (isspace(*s)) s++;
     }
 
@@ -245,7 +245,7 @@ switch (redis_reply->type)
     if (Ustrncmp(redis_reply->str, "MOVED", 5) == 0)
       {
       DEBUG(D_lookup)
-        debug_printf("REDIS: cluster redirect %s\n", redis_reply->str);
+        debug_printf_indent("REDIS: cluster redirect %s\n", redis_reply->str);
       /* follow redirect
       This is cheating, we simply set defer_break = FALSE to move on to
       the next server in the redis_servers list */
@@ -260,7 +260,7 @@ switch (redis_reply->type)
 
   case REDIS_REPLY_NIL:
     DEBUG(D_lookup)
-      debug_printf("REDIS: query was not one that returned any data\n");
+      debug_printf_indent("REDIS: query was not one that returned any data\n");
     result = string_catn(result, US"", 1);
     *do_cache = 0;
     goto REDIS_EXIT;
@@ -313,18 +313,18 @@ switch (redis_reply->type)
 		break;
 	      case REDIS_REPLY_ARRAY:
 		DEBUG(D_lookup)
-		  debug_printf("REDIS: result has nesting of arrays which"
+		  debug_printf_indent("REDIS: result has nesting of arrays which"
 		    " is not supported. Ignoring!\n");
 		break;
 	      default:
-		DEBUG(D_lookup) debug_printf(
+		DEBUG(D_lookup) debug_printf_indent(
 			  "REDIS: result has unsupported type. Ignoring!\n");
 		break;
 	      }
 	    }
 	    break;
 	  default:
-	    DEBUG(D_lookup) debug_printf("REDIS: query returned unsupported type\n");
+	    DEBUG(D_lookup) debug_printf_indent("REDIS: query returned unsupported type\n");
 	    break;
 	  }
 	}
@@ -356,7 +356,7 @@ if (result)
   }
 else
   {
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   /* NOTE: Required to close connection since it needs to be reopened */
   return yield;      /* FAIL or DEFER */
   }
diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c
index 4bf616052..5da2de814 100644
--- a/src/src/lookups/sqlite.c
+++ b/src/src/lookups/sqlite.c
@@ -27,7 +27,7 @@ ret = sqlite3_open(CS filename, &db);
 if (ret != 0)
   {
   *errmsg = (void *)sqlite3_errmsg(db);
-  debug_printf("Error opening database: %s\n", *errmsg);
+  debug_printf_indent("Error opening database: %s\n", *errmsg);
   }
 
 sqlite3_busy_timeout(db, 1000 * sqlite_lock_timeout);
@@ -79,7 +79,7 @@ gstring * res = NULL;
 ret = sqlite3_exec(handle, CS query, sqlite_callback, &res, (char **)errmsg);
 if (ret != SQLITE_OK)
   {
-  debug_printf("sqlite3_exec failed: %s\n", *errmsg);
+  debug_printf_indent("sqlite3_exec failed: %s\n", *errmsg);
   return FAIL;
   }
 
diff --git a/src/src/lookups/testdb.c b/src/src/lookups/testdb.c
index 401f7c8bf..3f19e80f6 100644
--- a/src/src/lookups/testdb.c
+++ b/src/src/lookups/testdb.c
@@ -47,13 +47,13 @@ length = length;
 if (Ustrcmp(query, "fail") == 0)
   {
   *errmsg = US"testdb lookup forced FAIL";
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return FAIL;
   }
 if (Ustrcmp(query, "defer") == 0)
   {
   *errmsg = US"testdb lookup forced DEFER";
-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);
   return DEFER;
   }
 
diff --git a/src/src/search.c b/src/src/search.c
index 11bfcd4df..ebdf8a165 100644
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -251,7 +251,7 @@ search_tidyup(void)
 {
 int old_pool = store_pool;
 
-DEBUG(D_lookup) debug_printf("search_tidyup called\n");
+DEBUG(D_lookup) debug_printf_indent("search_tidyup called\n");
 
 /* Close individually each cached open file. */
 
@@ -341,8 +341,8 @@ int old_pool = store_pool;
 store_pool = POOL_SEARCH;
 if (search_reset_point == NULL) search_reset_point = store_get(0);
 
-DEBUG(D_lookup) debug_printf("search_open: %s \"%s\"\n", lk->name,
-  (filename == NULL)? US"NULL" : filename);
+DEBUG(D_lookup) debug_printf_indent("search_open: %s \"%s\"\n", lk->name,
+  filename ? filename : US"NULL");
 
 /* See if we already have this open for this type of search, and if so,
 pass back the tree block as the handle. The key for the tree node is the search
@@ -357,11 +357,11 @@ if ((t = tree_search(search_tree, keybuffer)) != NULL)
   c = (search_cache *)(t->data.ptr);
   if (c->handle != NULL)
     {
-    DEBUG(D_lookup) debug_printf("  cached open\n");
+    DEBUG(D_lookup) debug_printf_indent("  cached open\n");
     store_pool = old_pool;
     return t;
     }
-  DEBUG(D_lookup) debug_printf("  cached closed\n");
+  DEBUG(D_lookup) debug_printf_indent("  cached closed\n");
   }
 
 /* Otherwise, we need to open the file or database - each search type has its
@@ -378,7 +378,7 @@ if (lk->type == lookup_absfile && open_filecount >= lookup_open_max)
   else
     {
     search_cache *c = (search_cache *)(open_bot->data.ptr);
-    DEBUG(D_lookup) debug_printf("Too many lookup files open\n  closing %s\n",
+    DEBUG(D_lookup) debug_printf_indent("Too many lookup files open\n  closing %s\n",
       open_bot->name);
     open_bot = c->up;
     if (open_bot != NULL)
@@ -476,7 +476,7 @@ the callers don't have to test for NULL, set an empty string. */
 search_error_message = US"";
 f.search_find_defer = FALSE;
 
-DEBUG(D_lookup) debug_printf("internal_search_find: file=\"%s\"\n  "
+DEBUG(D_lookup) debug_printf_indent("internal_search_find: file=\"%s\"\n  "
   "type=%s key=\"%s\"\n", filename,
   lookup_list[search_type]->name, keystring);
 
@@ -496,7 +496,7 @@ if (  (t = tree_search(c->item_cache, keystring))
    )
   { /* Data was in the cache already; set the pointer from the tree node */
   data = e->ptr;
-  DEBUG(D_lookup) debug_printf("cached data used for lookup of %s%s%s\n",
+  DEBUG(D_lookup) debug_printf_indent("cached data used for lookup of %s%s%s\n",
     keystring,
     filename ? US"\n  in " : US"", filename ? filename : US"");
   }
@@ -507,8 +507,8 @@ else
 
   DEBUG(D_lookup)
     {
-    if (t) debug_printf("cached data found but past valid time; ");
-    debug_printf("%s lookup required for %s%s%s\n",
+    if (t) debug_printf_indent("cached data found but past valid time; ");
+    debug_printf_indent("%s lookup required for %s%s%s\n",
       filename ? US"file" : US"database",
       keystring,
       filename ? US"\n  in " : US"", filename ? filename : US"");
@@ -554,7 +554,7 @@ else
 
   else
     {
-    DEBUG(D_lookup) debug_printf("lookup forced cache cleanup\n");
+    DEBUG(D_lookup) debug_printf_indent("lookup forced cache cleanup\n");
     c->item_cache = NULL;
     }
   }
@@ -562,10 +562,10 @@ else
 DEBUG(D_lookup)
   {
   if (data)
-    debug_printf("lookup yielded: %s\n", data);
+    debug_printf_indent("lookup yielded: %s\n", data);
   else if (f.search_find_defer)
-    debug_printf("lookup deferred: %s\n", search_error_message);
-  else debug_printf("lookup failed\n");
+    debug_printf_indent("lookup deferred: %s\n", search_error_message);
+  else debug_printf_indent("lookup failed\n");
   }
 
 /* Return it in new dynamic store in the regular pool */
@@ -614,7 +614,7 @@ uschar *yield;
 DEBUG(D_lookup)
   {
   if (partial < 0) affixlen = 99;   /* So that "NULL" prints */
-  debug_printf("search_find: file=\"%s\"\n  key=\"%s\" "
+  debug_printf_indent("search_find: file=\"%s\"\n  key=\"%s\" "
     "partial=%d affix=%.*s starflags=%x\n",
     (filename == NULL)? US"NULL" : filename,
     keystring, partial, affixlen, affix, starflags);
@@ -653,13 +653,12 @@ if (open_top != (tree_node *)handle &&
 
 DEBUG(D_lookup)
   {
-  tree_node *t = open_top;
-  debug_printf("LRU list:\n");
-  while (t != NULL)
+  debug_printf_indent("LRU list:\n");
+  for (tree_node *t = open_top; t; )
     {
     search_cache *c = (search_cache *)(t->data.ptr);
-    debug_printf("  %s\n", t->name);
-    if (t == open_bot) debug_printf("  End\n");
+    debug_printf_indent("  %s\n", t->name);
+    if (t == open_bot) debug_printf_indent("  End\n");
     t = c->down;
     }
   }
@@ -689,7 +688,7 @@ else if (partial >= 0)
     keystring2 = store_get(len + affixlen + 1);
     Ustrncpy(keystring2, affix, affixlen);
     Ustrcpy(keystring2 + affixlen, keystring);
-    DEBUG(D_lookup) debug_printf("trying partial match %s\n", keystring2);
+    DEBUG(D_lookup) debug_printf_indent("trying partial match %s\n", keystring2);
     yield = internal_search_find(handle, filename, keystring2);
     if (f.search_find_defer) return NULL;
     }
@@ -727,7 +726,7 @@ else if (partial >= 0)
         if (affixlen > 0) Ustrncpy(keystring3, affix, affixlen);
         }
 
-      DEBUG(D_lookup) debug_printf("trying partial match %s\n", keystring3);
+      DEBUG(D_lookup) debug_printf_indent("trying partial match %s\n", keystring3);
       yield = internal_search_find(handle, filename, keystring3);
       if (f.search_find_defer) return NULL;
       if (yield != NULL)
@@ -768,7 +767,7 @@ if (yield == NULL && (starflags & SEARCH_STARAT) != 0)
     savechar = *(--atat);
     *atat = '*';
 
-    DEBUG(D_lookup) debug_printf("trying default match %s\n", atat);
+    DEBUG(D_lookup) debug_printf_indent("trying default match %s\n", atat);
     yield = internal_search_find(handle, filename, atat);
     *atat = savechar;
     if (f.search_find_defer) return NULL;
@@ -791,7 +790,7 @@ and the second is empty. */
 
 if (yield == NULL && (starflags & (SEARCH_STAR|SEARCH_STARAT)) != 0)
   {
-  DEBUG(D_lookup) debug_printf("trying to match *\n");
+  DEBUG(D_lookup) debug_printf_indent("trying to match *\n");
   yield = internal_search_find(handle, filename, US"*");
   if (yield != NULL && expand_setup != NULL && *expand_setup >= 0)
     {
diff --git a/test/stderr/0085 b/test/stderr/0085
index 3e44df439..86ef5840d 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -44,31 +44,31 @@ local_part=x domain=smart.domain
 checking domains
 smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="smart.domain" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="smart.domain"
-file lookup required for smart.domain
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="smart.domain" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="smart.domain"
+ file lookup required for smart.domain
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="smart.domain" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="smart.domain"
-cached data used for lookup of smart.domain
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="smart.domain" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="smart.domain"
+ cached data used for lookup of smart.domain
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
 address match test: subject=abc@d.e.f pattern=y
@@ -112,32 +112,32 @@ local_part=x domain=test.ex
 checking domains
 test.ex in "test.ex"? yes (matched "test.ex")
 checking local_parts
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="test.ex"
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="test.ex"
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="test.ex"
-cached data used for lookup of test.ex
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="test.ex"
+ cached data used for lookup of test.ex
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
 address match test: subject=abc@d.e.f pattern=y
@@ -146,18 +146,18 @@ address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 checking require_files
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="test.ex.files" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="test.ex.files"
-file lookup required for test.ex.files
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: /etc/passwd
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="test.ex.files" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="test.ex.files"
+ file lookup required for test.ex.files
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: /etc/passwd
 file check: ${lookup{$domain.files}lsearch{TESTSUITE/aux-fixed/0085.data}{$value}}
 expanded file: /etc/passwd
 stat() yielded 0
@@ -243,31 +243,31 @@ local_part=x domain=smart.domain
 checking domains
 smart.domain in "smart.domain"? yes (matched "smart.domain")
 checking local_parts
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="smart.domain" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="smart.domain"
-file lookup required for smart.domain
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="smart.domain" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="smart.domain"
+ file lookup required for smart.domain
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="smart.domain" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="smart.domain"
-cached data used for lookup of smart.domain
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="smart.domain" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="smart.domain"
+ cached data used for lookup of smart.domain
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
 address match test: subject=CALLER@myhost.test.ex pattern=y
@@ -309,32 +309,32 @@ local_part=x domain=test.ex
 checking domains
 test.ex in "test.ex"? yes (matched "test.ex")
 checking local_parts
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="test.ex"
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="test.ex"
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 x in "x : y : abc@d.e.f"? yes (matched "x")
 checking senders
-search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0085.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0085.data
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
-  type=lsearch key="test.ex"
-cached data used for lookup of test.ex
-  in TESTSUITE/aux-fixed/0085.data
-lookup yielded: x : y : abc@d.e.f
+ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0085.data"
+   key="test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0085.data
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
+   type=lsearch key="test.ex"
+ cached data used for lookup of test.ex
+   in TESTSUITE/aux-fixed/0085.data
+ lookup yielded: x : y : abc@d.e.f
 address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
 address match test: subject=CALLER@myhost.test.ex pattern=y
diff --git a/test/stderr/0123 b/test/stderr/0123
index 6349373da..34c2c1ee5 100644
--- a/test/stderr/0123
+++ b/test/stderr/0123
@@ -17,17 +17,17 @@ routing x@test.ex
 local_part=x domain=test.ex
 calling l1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases1}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
-search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases1
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases1
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -36,18 +36,18 @@ l1 router declined for x@test.ex
 local_part=x domain=test.ex
 calling l2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases2}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
-search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases2
-  0TESTSUITE/aux-fixed/0123.aliases1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases2
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases2
+   0TESTSUITE/aux-fixed/0123.aliases1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases2
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -56,20 +56,20 @@ l2 router declined for x@test.ex
 local_part=x domain=test.ex
 calling l3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases3}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases1
-search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases3
-  0TESTSUITE/aux-fixed/0123.aliases2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases3
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases1
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases3
+   0TESTSUITE/aux-fixed/0123.aliases2
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases3
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -78,20 +78,20 @@ l3 router declined for x@test.ex
 local_part=x domain=test.ex
 calling c1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases4}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases2
-search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases4
-  0TESTSUITE/aux-fixed/0123.aliases3
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases4
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases2
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases4
+   0TESTSUITE/aux-fixed/0123.aliases3
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases4
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -100,20 +100,20 @@ c1 router declined for x@test.ex
 local_part=x domain=test.ex
 calling c2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases5}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases3
-search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases5
-  0TESTSUITE/aux-fixed/0123.aliases4
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases5
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases3
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases5
+   0TESTSUITE/aux-fixed/0123.aliases4
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases5
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -122,20 +122,20 @@ c2 router declined for x@test.ex
 local_part=x domain=test.ex
 calling c3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases6}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases4
-search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  key="x" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases6
-  0TESTSUITE/aux-fixed/0123.aliases5
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  type=lsearch key="x"
-file lookup required for x
-  in TESTSUITE/aux-fixed/0123.aliases6
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases4
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   key="x" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases6
+   0TESTSUITE/aux-fixed/0123.aliases5
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   type=lsearch key="x"
+ file lookup required for x
+   in TESTSUITE/aux-fixed/0123.aliases6
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -151,21 +151,21 @@ routing y@test.ex
 local_part=y domain=test.ex
 calling l1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases1}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases5
-search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases1
-  0TESTSUITE/aux-fixed/0123.aliases6
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases1
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases5
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases1
+   0TESTSUITE/aux-fixed/0123.aliases6
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases1
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -174,21 +174,21 @@ l1 router declined for y@test.ex
 local_part=y domain=test.ex
 calling l2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases2}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases6
-search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases2
-  0TESTSUITE/aux-fixed/0123.aliases1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases2
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases6
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases2
+   0TESTSUITE/aux-fixed/0123.aliases1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases2
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -197,21 +197,21 @@ l2 router declined for y@test.ex
 local_part=y domain=test.ex
 calling l3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases3}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases1
-search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases3
-  0TESTSUITE/aux-fixed/0123.aliases2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases3
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases1
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases3
+   0TESTSUITE/aux-fixed/0123.aliases2
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases3
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -220,21 +220,21 @@ l3 router declined for y@test.ex
 local_part=y domain=test.ex
 calling c1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases4}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases2
-search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases4
-  0TESTSUITE/aux-fixed/0123.aliases3
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases4
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases2
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases4
+   0TESTSUITE/aux-fixed/0123.aliases3
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases4
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -243,21 +243,21 @@ c1 router declined for y@test.ex
 local_part=y domain=test.ex
 calling c2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases5}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases3
-search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases5
-  0TESTSUITE/aux-fixed/0123.aliases4
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases5
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases3
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases5
+   0TESTSUITE/aux-fixed/0123.aliases4
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases5
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -266,21 +266,21 @@ c2 router declined for y@test.ex
 local_part=y domain=test.ex
 calling c3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases6}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases4
-search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  key="y" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases6
-  0TESTSUITE/aux-fixed/0123.aliases5
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  type=lsearch key="y"
-file lookup required for y
-  in TESTSUITE/aux-fixed/0123.aliases6
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases4
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   key="y" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases6
+   0TESTSUITE/aux-fixed/0123.aliases5
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   type=lsearch key="y"
+ file lookup required for y
+   in TESTSUITE/aux-fixed/0123.aliases6
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -296,21 +296,21 @@ routing z@test.ex
 local_part=z domain=test.ex
 calling l1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases1}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases5
-search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases1
-  0TESTSUITE/aux-fixed/0123.aliases6
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases1
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases1"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases5
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases1
+   0TESTSUITE/aux-fixed/0123.aliases6
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases1"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases1
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -319,21 +319,21 @@ l1 router declined for z@test.ex
 local_part=z domain=test.ex
 calling l2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases2}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases6
-search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases2
-  0TESTSUITE/aux-fixed/0123.aliases1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases2
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases2"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases6
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases2
+   0TESTSUITE/aux-fixed/0123.aliases1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases2"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases2
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -342,21 +342,21 @@ l2 router declined for z@test.ex
 local_part=z domain=test.ex
 calling l3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases3}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases1
-search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases3
-  0TESTSUITE/aux-fixed/0123.aliases2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases3
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases3"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases1
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases3
+   0TESTSUITE/aux-fixed/0123.aliases2
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases3"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases3
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -365,21 +365,21 @@ l3 router declined for z@test.ex
 local_part=z domain=test.ex
 calling c1 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases4}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases2
-search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases4
-  0TESTSUITE/aux-fixed/0123.aliases3
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases4
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases4"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases2
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases4
+   0TESTSUITE/aux-fixed/0123.aliases3
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases4"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases4
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -388,21 +388,21 @@ c1 router declined for z@test.ex
 local_part=z domain=test.ex
 calling c2 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases5}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases3
-search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases5
-  0TESTSUITE/aux-fixed/0123.aliases4
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases5
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases5"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases3
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases5
+   0TESTSUITE/aux-fixed/0123.aliases4
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases5"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases5
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
@@ -411,21 +411,21 @@ c2 router declined for z@test.ex
 local_part=z domain=test.ex
 calling c3 router
 rda_interpret (string): ${lookup{$local_part}lsearch{TESTSUITE/aux-fixed/0123.aliases6}}
-search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
-  cached closed
-Too many lookup files open
-  closing 0TESTSUITE/aux-fixed/0123.aliases4
-search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  key="z" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0123.aliases6
-  0TESTSUITE/aux-fixed/0123.aliases5
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
-  type=lsearch key="z"
-file lookup required for z
-  in TESTSUITE/aux-fixed/0123.aliases6
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0123.aliases6"
+   cached closed
+ Too many lookup files open
+   closing 0TESTSUITE/aux-fixed/0123.aliases4
+ search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   key="z" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0123.aliases6
+   0TESTSUITE/aux-fixed/0123.aliases5
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0123.aliases6"
+   type=lsearch key="z"
+ file lookup required for z
+   in TESTSUITE/aux-fixed/0123.aliases6
+ lookup failed
 expanded: 
 file is not a filter file
 parse_forward_list: 
diff --git a/test/stderr/0387 b/test/stderr/0387
index 7c06934ff..702e02538 100644
--- a/test/stderr/0387
+++ b/test/stderr/0387
@@ -3,436 +3,436 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-file lookup required for a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.a.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.a.b.c"
-file lookup required for *.a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.b.c"
-file lookup required for *.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*.b.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.y.c" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.y.c"
-file lookup required for x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.x.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.x.y.c"
-file lookup required for *.x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.y.c"
-file lookup required for *.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.y.c" partial=2 affix=*. starflags=1
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.y.c"
-cached data used for lookup of x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.x.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.x.y.c"
-cached data used for lookup of *.x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.y.c"
-cached data used for lookup of *.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying to match *
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*"
-file lookup required for *
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.y.c" partial=1 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.y.c"
-cached data used for lookup of x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.x.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.x.y.c"
-cached data used for lookup of *.x.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.y.c"
-cached data used for lookup of *.y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.c"
-file lookup required for *.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x@y.c" partial=1 affix=*. starflags=2
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x@y.c"
-file lookup required for x@y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.x@y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.x@y.c"
-file lookup required for *.x@y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.c"
-cached data used for lookup of *.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x@y.c" partial=-1 affix=NULL starflags=2
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x@y.c"
-cached data used for lookup of x@y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying default match *@y.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*@y.c"
-file lookup required for *@y.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*@y.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-cached data used for lookup of a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.a.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.a.b.c"
-cached data used for lookup of *.a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.b.c"
-cached data used for lookup of *.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*.b.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix=. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-cached data used for lookup of a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .a.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key=".a.b.c"
-file lookup required for .a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key=".b.c"
-file lookup required for .b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [.b.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix= starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-cached data used for lookup of a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="b.c"
-file lookup required for b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [b.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix=* starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-cached data used for lookup of a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *a.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*a.b.c"
-file lookup required for *a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*b.c"
-file lookup required for *b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*b.c]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="p.q.r" partial=0 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="p.q.r"
-file lookup required for p.q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.p.q.r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.p.q.r"
-file lookup required for *.p.q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.q.r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.q.r"
-file lookup required for *.q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.r"
-file lookup required for *.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*"
-cached data used for lookup of *
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="p.q.r" partial=0 affix=. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="p.q.r"
-cached data used for lookup of p.q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .p.q.r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key=".p.q.r"
-file lookup required for .p.q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .q.r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key=".q.r"
-file lookup required for .q.r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .r
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key=".r"
-file lookup required for .r
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match .
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="."
-file lookup required for .
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [.]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.aa.bb" partial=0 affix=++ starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.aa.bb"
-file lookup required for x.aa.bb
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++x.aa.bb
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++x.aa.bb"
-file lookup required for ++x.aa.bb
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++aa.bb
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++aa.bb"
-file lookup required for ++aa.bb
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [++aa.bb]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.aa.zz" partial=0 affix=++ starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.aa.zz"
-file lookup required for x.aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++x.aa.zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++x.aa.zz"
-file lookup required for ++x.aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++aa.zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++aa.zz"
-file lookup required for ++aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++zz"
-file lookup required for ++zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++"
-file lookup required for ++
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [++]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="x.aa.zz" partial=1 affix=++ starflags=1
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="x.aa.zz"
-cached data used for lookup of x.aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++x.aa.zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++x.aa.zz"
-cached data used for lookup of ++x.aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++aa.zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++aa.zz"
-cached data used for lookup of ++aa.zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match ++zz
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="++zz"
-cached data used for lookup of ++zz
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying to match *
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*"
-cached data used for lookup of *
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*]
-search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0387.1"
-  key="a.b.c" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0387.1
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="a.b.c"
-cached data used for lookup of a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.a.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.a.b.c"
-cached data used for lookup of *.a.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup failed
-trying partial match *.b.c
-internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
-  type=lsearch key="*.b.c"
-cached data used for lookup of *.b.c
-  in TESTSUITE/aux-fixed/0387.1
-lookup yielded: [*.b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ file lookup required for a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.a.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.a.b.c"
+ file lookup required for *.a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.b.c"
+ file lookup required for *.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*.b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.y.c" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.y.c"
+ file lookup required for x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.x.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.x.y.c"
+ file lookup required for *.x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.y.c"
+ file lookup required for *.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.y.c" partial=2 affix=*. starflags=1
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.y.c"
+ cached data used for lookup of x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.x.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.x.y.c"
+ cached data used for lookup of *.x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.y.c"
+ cached data used for lookup of *.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying to match *
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*"
+ file lookup required for *
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.y.c" partial=1 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.y.c"
+ cached data used for lookup of x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.x.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.x.y.c"
+ cached data used for lookup of *.x.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.y.c"
+ cached data used for lookup of *.y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.c"
+ file lookup required for *.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x@y.c" partial=1 affix=*. starflags=2
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x@y.c"
+ file lookup required for x@y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.x@y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.x@y.c"
+ file lookup required for *.x@y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.c"
+ cached data used for lookup of *.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x@y.c" partial=-1 affix=NULL starflags=2
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x@y.c"
+ cached data used for lookup of x@y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying default match *@y.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*@y.c"
+ file lookup required for *@y.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*@y.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ cached data used for lookup of a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.a.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.a.b.c"
+ cached data used for lookup of *.a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.b.c"
+ cached data used for lookup of *.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*.b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix=. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ cached data used for lookup of a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .a.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key=".a.b.c"
+ file lookup required for .a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key=".b.c"
+ file lookup required for .b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [.b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix= starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ cached data used for lookup of a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="b.c"
+ file lookup required for b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix=* starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ cached data used for lookup of a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *a.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*a.b.c"
+ file lookup required for *a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*b.c"
+ file lookup required for *b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*b.c]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="p.q.r" partial=0 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="p.q.r"
+ file lookup required for p.q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.p.q.r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.p.q.r"
+ file lookup required for *.p.q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.q.r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.q.r"
+ file lookup required for *.q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.r"
+ file lookup required for *.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*"
+ cached data used for lookup of *
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="p.q.r" partial=0 affix=. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="p.q.r"
+ cached data used for lookup of p.q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .p.q.r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key=".p.q.r"
+ file lookup required for .p.q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .q.r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key=".q.r"
+ file lookup required for .q.r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .r
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key=".r"
+ file lookup required for .r
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match .
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="."
+ file lookup required for .
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [.]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.aa.bb" partial=0 affix=++ starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.aa.bb"
+ file lookup required for x.aa.bb
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++x.aa.bb
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++x.aa.bb"
+ file lookup required for ++x.aa.bb
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++aa.bb
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++aa.bb"
+ file lookup required for ++aa.bb
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [++aa.bb]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.aa.zz" partial=0 affix=++ starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.aa.zz"
+ file lookup required for x.aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++x.aa.zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++x.aa.zz"
+ file lookup required for ++x.aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++aa.zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++aa.zz"
+ file lookup required for ++aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++zz"
+ file lookup required for ++zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++"
+ file lookup required for ++
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [++]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="x.aa.zz" partial=1 affix=++ starflags=1
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="x.aa.zz"
+ cached data used for lookup of x.aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++x.aa.zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++x.aa.zz"
+ cached data used for lookup of ++x.aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++aa.zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++aa.zz"
+ cached data used for lookup of ++aa.zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match ++zz
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="++zz"
+ cached data used for lookup of ++zz
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying to match *
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*"
+ cached data used for lookup of *
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*]
+ search_open: lsearch "TESTSUITE/aux-fixed/0387.1"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0387.1"
+   key="a.b.c" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0387.1
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="a.b.c"
+ cached data used for lookup of a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.a.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.a.b.c"
+ cached data used for lookup of *.a.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup failed
+ trying partial match *.b.c
+ internal_search_find: file="TESTSUITE/aux-fixed/0387.1"
+   type=lsearch key="*.b.c"
+ cached data used for lookup of *.b.c
+   in TESTSUITE/aux-fixed/0387.1
+ lookup yielded: [*.b.c]
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0437 b/test/stderr/0437
index 1c9d3fde5..6bbf6b7f0 100644
--- a/test/stderr/0437
+++ b/test/stderr/0437
@@ -1,45 +1,45 @@
 Exim version x.yz ....
-search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
-search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  key="spool" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0437.ls
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  type=lsearch key="spool"
-file lookup required for spool
-  in TESTSUITE/aux-fixed/0437.ls
-lookup yielded: spool
+ search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
+ search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   key="spool" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0437.ls
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   type=lsearch key="spool"
+ file lookup required for spool
+   in TESTSUITE/aux-fixed/0437.ls
+ lookup yielded: spool
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 search_tidyup called
-search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
-search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  key="transport" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0437.ls
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  type=lsearch key="transport"
-file lookup required for transport
-  in TESTSUITE/aux-fixed/0437.ls
-lookup yielded: t1
+ search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
+ search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   key="transport" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0437.ls
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   type=lsearch key="transport"
+ file lookup required for transport
+   in TESTSUITE/aux-fixed/0437.ls
+ lookup yielded: t1
 search_tidyup called
 search_tidyup called
-search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
-search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  key="file" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0437.ls
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  type=lsearch key="file"
-file lookup required for file
-  in TESTSUITE/aux-fixed/0437.ls
-lookup yielded: file
+ search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
+ search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   key="file" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0437.ls
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   type=lsearch key="file"
+ file lookup required for file
+   in TESTSUITE/aux-fixed/0437.ls
+ lookup yielded: file
 search_tidyup called
 LOG: MAIN
   => userx <userx@myhost.test.ex> R=r1 T=t1
@@ -47,30 +47,30 @@ LOG: MAIN
   Completed
 search_tidyup called
 search_tidyup called
-search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
-search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  key="transport" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0437.ls
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  type=lsearch key="transport"
-file lookup required for transport
-  in TESTSUITE/aux-fixed/0437.ls
-lookup yielded: t1
+ search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
+ search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   key="transport" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0437.ls
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   type=lsearch key="transport"
+ file lookup required for transport
+   in TESTSUITE/aux-fixed/0437.ls
+ lookup yielded: t1
 search_tidyup called
 search_tidyup called
-search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
-search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  key="file" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0437.ls
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
-  type=lsearch key="file"
-file lookup required for file
-  in TESTSUITE/aux-fixed/0437.ls
-lookup yielded: file
+ search_open: lsearch "TESTSUITE/aux-fixed/0437.ls"
+ search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   key="file" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0437.ls
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0437.ls"
+   type=lsearch key="file"
+ file lookup required for file
+   in TESTSUITE/aux-fixed/0437.ls
+ lookup yielded: file
 search_tidyup called
 LOG: MAIN
   => userx <userx@myhost.test.ex> R=r1 T=t1
diff --git a/test/stderr/0471 b/test/stderr/0471
index 792b55e8e..6c75643b2 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -101,50 +101,50 @@ To: random@test.example,
 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:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.ex"
-file lookup required for test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-file lookup required for *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
+ 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:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.ex"
+ file lookup required for test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex"
+ file lookup required for *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="myhost.test.ex" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="myhost.test.ex"
-file lookup required for myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.myhost.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.myhost.test.ex"
-file lookup required for *.myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-cached data used for lookup of *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="myhost.test.ex" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="myhost.test.ex"
+ file lookup required for myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.myhost.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.myhost.test.ex"
+ file lookup required for *.myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex"
+ cached data used for lookup of *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
 rewritten sender = CALLER@myhost.test.ex
 rewrite_one_header: type=T:
   To: random@test.example,
@@ -230,18 +230,18 @@ rewrite_one_header: type=T:
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-file lookup required for test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ file lookup required for test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4051 newtype=T newtext:
@@ -409,18 +409,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4053 newtype=T newtext:
@@ -588,18 +588,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4055 newtype=T newtext:
@@ -767,18 +767,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4057 newtype=T newtext:
@@ -946,18 +946,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4059 newtype=T newtext:
@@ -1125,18 +1125,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4061 newtype=T newtext:
@@ -1304,18 +1304,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4063 newtype=T newtext:
@@ -1483,18 +1483,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4065 newtype=T newtext:
@@ -1662,18 +1662,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4067 newtype=T newtext:
@@ -1841,18 +1841,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4069 newtype=T newtext:
@@ -2019,18 +2019,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4071 newtype=T newtext:
@@ -2197,18 +2197,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4073 newtype=T newtext:
@@ -2375,18 +2375,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4075 newtype=T newtext:
@@ -2553,18 +2553,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4077 newtype=T newtext:
@@ -2731,18 +2731,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4079 newtype=T newtext:
@@ -2909,18 +2909,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4081 newtype=T newtext:
@@ -3087,18 +3087,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4083 newtype=T newtext:
@@ -3265,18 +3265,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4085 newtype=T newtext:
@@ -3443,18 +3443,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4087 newtype=T newtext:
@@ -3621,18 +3621,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4089 newtype=T newtext:
@@ -3799,18 +3799,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4091 newtype=T newtext:
@@ -3977,18 +3977,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4093 newtype=T newtext:
@@ -4155,18 +4155,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4095 newtype=T newtext:
@@ -4332,18 +4332,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4097 newtype=T newtext:
@@ -4509,18 +4509,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4099 newtype=T newtext:
@@ -4686,18 +4686,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4101 newtype=T newtext:
@@ -4863,18 +4863,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4103 newtype=T newtext:
@@ -5040,18 +5040,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4105 newtype=T newtext:
@@ -5217,18 +5217,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4107 newtype=T newtext:
@@ -5394,18 +5394,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4109 newtype=T newtext:
@@ -5571,18 +5571,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4111 newtype=T newtext:
@@ -5748,18 +5748,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4113 newtype=T newtext:
@@ -5925,18 +5925,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4115 newtype=T newtext:
@@ -6102,18 +6102,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4117 newtype=T newtext:
@@ -6279,18 +6279,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4119 newtype=T newtext:
@@ -6455,18 +6455,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4121 newtype=T newtext:
@@ -6631,18 +6631,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4123 newtype=T newtext:
@@ -6807,18 +6807,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4125 newtype=T newtext:
@@ -6983,18 +6983,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4127 newtype=T newtext:
@@ -7159,18 +7159,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4129 newtype=T newtext:
@@ -7335,18 +7335,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4131 newtype=T newtext:
@@ -7511,18 +7511,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4133 newtype=T newtext:
@@ -7687,18 +7687,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4135 newtype=T newtext:
@@ -7863,18 +7863,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4137 newtype=T newtext:
@@ -8039,18 +8039,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4139 newtype=T newtext:
@@ -8215,18 +8215,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4141 newtype=T newtext:
@@ -8391,18 +8391,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4143 newtype=T newtext:
@@ -8567,18 +8567,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4145 newtype=T newtext:
@@ -8742,18 +8742,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4147 newtype=T newtext:
@@ -8917,18 +8917,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4149 newtype=T newtext:
@@ -9092,18 +9092,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4151 newtype=T newtext:
@@ -9267,18 +9267,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4153 newtype=T newtext:
@@ -9442,18 +9442,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4155 newtype=T newtext:
@@ -9617,18 +9617,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4157 newtype=T newtext:
@@ -9792,18 +9792,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4159 newtype=T newtext:
@@ -9967,18 +9967,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4161 newtype=T newtext:
@@ -10142,18 +10142,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4163 newtype=T newtext:
@@ -10317,18 +10317,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4165 newtype=T newtext:
@@ -10492,18 +10492,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4167 newtype=T newtext:
@@ -10667,18 +10667,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4169 newtype=T newtext:
@@ -10841,18 +10841,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4171 newtype=T newtext:
@@ -11015,18 +11015,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4173 newtype=T newtext:
@@ -11189,18 +11189,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4175 newtype=T newtext:
@@ -11363,18 +11363,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4177 newtype=T newtext:
@@ -11537,18 +11537,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4179 newtype=T newtext:
@@ -11711,18 +11711,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4181 newtype=T newtext:
@@ -11885,18 +11885,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4183 newtype=T newtext:
@@ -12059,18 +12059,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4185 newtype=T newtext:
@@ -12233,18 +12233,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4187 newtype=T newtext:
@@ -12407,18 +12407,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4189 newtype=T newtext:
@@ -12581,18 +12581,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4191 newtype=T newtext:
@@ -12755,18 +12755,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4193 newtype=T newtext:
@@ -12929,18 +12929,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4195 newtype=T newtext:
@@ -13102,18 +13102,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4197 newtype=T newtext:
@@ -13275,18 +13275,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4199 newtype=T newtext:
@@ -13448,18 +13448,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4201 newtype=T newtext:
@@ -13621,18 +13621,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4203 newtype=T newtext:
@@ -13794,18 +13794,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4205 newtype=T newtext:
@@ -13967,18 +13967,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4207 newtype=T newtext:
@@ -14140,18 +14140,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4209 newtype=T newtext:
@@ -14313,18 +14313,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4211 newtype=T newtext:
@@ -14486,18 +14486,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4213 newtype=T newtext:
@@ -14658,18 +14658,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4215 newtype=T newtext:
@@ -14829,18 +14829,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4217 newtype=T newtext:
@@ -14999,18 +14999,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4219 newtype=T newtext:
@@ -15168,18 +15168,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4221 newtype=T newtext:
@@ -15336,18 +15336,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4223 newtype=T newtext:
@@ -15503,18 +15503,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4225 newtype=T newtext:
@@ -15669,18 +15669,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4227 newtype=T newtext:
@@ -15834,18 +15834,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4229 newtype=T newtext:
@@ -15998,18 +15998,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4231 newtype=T newtext:
@@ -16161,18 +16161,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4233 newtype=T newtext:
@@ -16323,18 +16323,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4235 newtype=T newtext:
@@ -16484,18 +16484,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4237 newtype=T newtext:
@@ -16644,18 +16644,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4239 newtype=T newtext:
@@ -16803,18 +16803,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4241 newtype=T newtext:
@@ -16961,18 +16961,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4243 newtype=T newtext:
@@ -17118,18 +17118,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4245 newtype=T newtext:
@@ -17274,18 +17274,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4247 newtype=T newtext:
@@ -17429,18 +17429,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4249 newtype=T newtext:
@@ -17583,18 +17583,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4251 newtype=T newtext:
@@ -17736,18 +17736,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4253 newtype=T newtext:
@@ -17888,18 +17888,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4255 newtype=T newtext:
@@ -18039,18 +18039,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4257 newtype=T newtext:
@@ -18189,18 +18189,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4259 newtype=T newtext:
@@ -18338,18 +18338,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4261 newtype=T newtext:
@@ -18486,18 +18486,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4263 newtype=T newtext:
@@ -18633,18 +18633,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4265 newtype=T newtext:
@@ -18779,18 +18779,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4267 newtype=T newtext:
@@ -18924,18 +18924,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4269 newtype=T newtext:
@@ -19068,18 +19068,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4271 newtype=T newtext:
@@ -19211,18 +19211,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4273 newtype=T newtext:
@@ -19353,18 +19353,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4275 newtype=T newtext:
@@ -19494,18 +19494,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4277 newtype=T newtext:
@@ -19634,18 +19634,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4279 newtype=T newtext:
@@ -19773,18 +19773,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4281 newtype=T newtext:
@@ -19911,18 +19911,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4283 newtype=T newtext:
@@ -20048,18 +20048,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4285 newtype=T newtext:
@@ -20184,18 +20184,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4287 newtype=T newtext:
@@ -20319,18 +20319,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4289 newtype=T newtext:
@@ -20453,18 +20453,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4291 newtype=T newtext:
@@ -20586,18 +20586,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4293 newtype=T newtext:
@@ -20718,18 +20718,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4295 newtype=T newtext:
@@ -20849,18 +20849,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4297 newtype=T newtext:
@@ -20979,18 +20979,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4299 newtype=T newtext:
@@ -21108,18 +21108,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4301 newtype=T newtext:
@@ -21236,18 +21236,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4303 newtype=T newtext:
@@ -21363,18 +21363,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4305 newtype=T newtext:
@@ -21489,18 +21489,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4307 newtype=T newtext:
@@ -21614,18 +21614,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4309 newtype=T newtext:
@@ -21738,18 +21738,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4311 newtype=T newtext:
@@ -21861,18 +21861,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4313 newtype=T newtext:
@@ -21983,18 +21983,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4315 newtype=T newtext:
@@ -22104,18 +22104,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4317 newtype=T newtext:
@@ -22224,18 +22224,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4319 newtype=T newtext:
@@ -22343,18 +22343,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4321 newtype=T newtext:
@@ -22461,18 +22461,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4323 newtype=T newtext:
@@ -22578,18 +22578,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4325 newtype=T newtext:
@@ -22694,18 +22694,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4327 newtype=T newtext:
@@ -22809,18 +22809,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4329 newtype=T newtext:
@@ -22923,18 +22923,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4331 newtype=T newtext:
@@ -23036,18 +23036,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4333 newtype=T newtext:
@@ -23148,18 +23148,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4335 newtype=T newtext:
@@ -23259,18 +23259,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4337 newtype=T newtext:
@@ -23369,18 +23369,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4339 newtype=T newtext:
@@ -23478,18 +23478,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4341 newtype=T newtext:
@@ -23586,18 +23586,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4343 newtype=T newtext:
@@ -23693,18 +23693,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4345 newtype=T newtext:
@@ -23799,18 +23799,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4347 newtype=T newtext:
@@ -23904,18 +23904,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4349 newtype=T newtext:
@@ -24008,18 +24008,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4351 newtype=T newtext:
@@ -24111,18 +24111,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4353 newtype=T newtext:
@@ -24213,18 +24213,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4355 newtype=T newtext:
@@ -24314,18 +24314,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4357 newtype=T newtext:
@@ -24414,18 +24414,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4359 newtype=T newtext:
@@ -24513,18 +24513,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4361 newtype=T newtext:
@@ -24611,18 +24611,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4363 newtype=T newtext:
@@ -24708,18 +24708,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4365 newtype=T newtext:
@@ -24804,18 +24804,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4367 newtype=T newtext:
@@ -24899,18 +24899,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4369 newtype=T newtext:
@@ -24993,18 +24993,18 @@ remainder: random@test.example,
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4371 newtype=T newtext:
@@ -25086,18 +25086,18 @@ remainder: random@test.example
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="test.example" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="test.example"
-cached data used for lookup of test.example
-  in TESTSUITE/aux-fixed/0471.rw
-lookup yielded: rwtest.example
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="test.example" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="test.example"
+ cached data used for lookup of test.example
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup yielded: rwtest.example
 LOG: address_rewrite MAIN
   "random@test.example" from to: rewritten as "random@rwtest.example" by rule 1
 newlen=4373 newtype=T newtext:
@@ -25181,30 +25181,30 @@ rewrite_one_header: type=F:
 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"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  key="myhost.test.ex" partial=2 affix=*. starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0471.rw
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="myhost.test.ex"
-cached data used for lookup of myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.myhost.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.myhost.test.ex"
-cached data used for lookup of *.myhost.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
-trying partial match *.test.ex
-internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
-  type=lsearch key="*.test.ex"
-cached data used for lookup of *.test.ex
-  in TESTSUITE/aux-fixed/0471.rw
-lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0471.rw"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   key="myhost.test.ex" partial=2 affix=*. starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0471.rw
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="myhost.test.ex"
+ cached data used for lookup of myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.myhost.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.myhost.test.ex"
+ cached data used for lookup of *.myhost.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
+ trying partial match *.test.ex
+ internal_search_find: file="TESTSUITE/aux-fixed/0471.rw"
+   type=lsearch key="*.test.ex"
+ cached data used for lookup of *.test.ex
+   in TESTSUITE/aux-fixed/0471.rw
+ lookup failed
 search_tidyup called
 >>Headers after rewriting and local additions:
 * To: random@test.example,
diff --git a/test/stderr/0484 b/test/stderr/0484
index c22aff4b5..9b1062755 100644
--- a/test/stderr/0484
+++ b/test/stderr/0484
@@ -6,128 +6,128 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="list"
-file lookup required for list
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="root"
-file lookup required for root
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
-search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases2
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  type=lsearch key="list"
-file lookup required for list
-  in TESTSUITE/aux-fixed/0484.aliases2
-lookup yielded: userx2, usery2
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases2
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  type=lsearch key="root"
-file lookup required for root
-  in TESTSUITE/aux-fixed/0484.aliases2
-lookup failed
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases2
-  0TESTSUITE/aux-fixed/0484.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/0484.aliases2
-lookup yielded: userx2, usery2
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  0TESTSUITE/aux-fixed/0484.aliases2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/0484.aliases
-  0TESTSUITE/aux-fixed/0484.aliases2
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/0484.aliases
-lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="list"
+ file lookup required for list
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="root"
+ file lookup required for root
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="root"
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases2
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   type=lsearch key="list"
+ file lookup required for list
+   in TESTSUITE/aux-fixed/0484.aliases2
+ lookup yielded: userx2, usery2
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases2
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   type=lsearch key="root"
+ file lookup required for root
+   in TESTSUITE/aux-fixed/0484.aliases2
+ lookup failed
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases2"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases2
+   0TESTSUITE/aux-fixed/0484.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases2"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/0484.aliases2
+ lookup yielded: userx2, usery2
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   0TESTSUITE/aux-fixed/0484.aliases2
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/0484.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/0484.aliases
+   0TESTSUITE/aux-fixed/0484.aliases2
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/0484.aliases"
+   type=lsearch key="root"
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/0484.aliases
+ lookup yielded: userx
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2200 b/test/stderr/2200
index 48f66b12f..894b4b72a 100644
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -2,24 +2,24 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=localhost.test.ex"
-database lookup required for a=localhost.test.ex
-dnsdb key: localhost.test.ex
-lookup yielded: 127.0.0.1
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=localhost.test.ex"
-cached data used for lookup of a=localhost.test.ex
-lookup yielded: 127.0.0.1
+ search_open: dnsdb "NULL"
+ search_find: file="NULL"
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key="a=localhost.test.ex"
+ database lookup required for a=localhost.test.ex
+ dnsdb key: localhost.test.ex
+ lookup yielded: 127.0.0.1
+ search_open: dnsdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key="a=localhost.test.ex"
+ cached data used for lookup of a=localhost.test.ex
+ lookup yielded: 127.0.0.1
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -27,25 +27,25 @@ configuration file is TESTSUITE/test-config
 admin user
 search_tidyup called
 search_tidyup called
-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=shorthost.test.ex"
-database lookup required for a=shorthost.test.ex
-dnsdb key: shorthost.test.ex
-lookup yielded: 127.0.0.1
-search_open: dnsdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key="a=shorthost.test.ex"
-cached data found but past valid time; database lookup required for a=shorthost.test.ex
-dnsdb key: shorthost.test.ex
-lookup yielded: 127.0.0.1
+  search_open: dnsdb "NULL"
+  search_find: file="NULL"
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+  LRU list:
+  internal_search_find: file="NULL"
+    type=dnsdb key="a=shorthost.test.ex"
+  database lookup required for a=shorthost.test.ex
+  dnsdb key: shorthost.test.ex
+  lookup yielded: 127.0.0.1
+  search_open: dnsdb "NULL"
+    cached open
+  search_find: file="NULL"
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+  LRU list:
+  internal_search_find: file="NULL"
+    type=dnsdb key="a=shorthost.test.ex"
+  cached data found but past valid time;   database lookup required for a=shorthost.test.ex
+  dnsdb key: shorthost.test.ex
+  lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
diff --git a/test/stderr/2202 b/test/stderr/2202
index ba331d76a..66debc3d5 100644
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -30,19 +30,19 @@ SMTP<< rcpt to:<a@b>
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = +ignore_unknown : *.$sender_address_domain : $sender_address_domain : ${lookup dnsdb{>:defer_never,mxh=$sender_address_domain}}
-search_open: dnsdb "NULL"
-search_find: file="NULL"
-  key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns"
-database lookup required for >:defer_never,mxh=cioce.test.again.dns
-dnsdb key: cioce.test.again.dns
+ search_open: dnsdb "NULL"
+ search_find: file="NULL"
+   key=">:defer_never,mxh=cioce.test.again.dns" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=dnsdb key=">:defer_never,mxh=cioce.test.again.dns"
+ database lookup required for >:defer_never,mxh=cioce.test.again.dns
+ dnsdb key: cioce.test.again.dns
 DNS lookup of cioce.test.again.dns (MX) using fakens
 DNS lookup of cioce.test.again.dns (MX) gave TRY_AGAIN
 cioce.test.again.dns in dns_again_means_nonexist? yes (matched "*")
 cioce.test.again.dns is in dns_again_means_nonexist: returning DNS_NOMATCH
-lookup failed
+ lookup failed
 sender host name required, to match against *.cioce.test.again.dns
 looking up host name for ip4.ip4.ip4.ip4
 DNS lookup of ip4-reverse.in-addr.arpa (PTR) using fakens
diff --git a/test/stderr/2600 b/test/stderr/2600
index 220cb38a2..3c2b058d6 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -2,107 +2,107 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-file lookup required for select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-cached data used for lookup of select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='xxxx';"
-file lookup required for select name from them where id='xxxx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup forced cache cleanup
-lookup failed
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='nothing';"
-file lookup required for select name from them where id='nothing';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select id,name from them where id='nothing';"
-file lookup required for select id,name from them where id='nothing';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: id=nothing name="" 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='quote2';"
-file lookup required for select * from them where id='quote2';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="\"stquot" id=quote2 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='newline';"
-file lookup required for select * from them where id='newline';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="before
-after" id=newline 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='tab';"
-file lookup required for select * from them where id='tab';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name="x	x" id=tab 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where id='its';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where id='its';"
-file lookup required for select * from them where id='its';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name=it's id=its 
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select * from them where name='it''s';"
-file lookup required for select * from them where name='it''s';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: name=it's id=its 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ file lookup required for select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ cached data used for lookup of select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='xxxx';"
+ file lookup required for select name from them where id='xxxx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup forced cache cleanup
+ lookup failed
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='nothing';"
+ file lookup required for select name from them where id='nothing';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select id,name from them where id='nothing';"
+ file lookup required for select id,name from them where id='nothing';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: id=nothing name="" 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='quote2';"
+ file lookup required for select * from them where id='quote2';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="\"stquot" id=quote2 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='newline';"
+ file lookup required for select * from them where id='newline';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="before
+ after" id=newline 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='tab';"
+ file lookup required for select * from them where id='tab';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name="x	x" id=tab 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where id='its';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where id='its';"
+ file lookup required for select * from them where id='its';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name=it's id=its 
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select * from them where name='it''s';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select * from them where name='it''s';"
+ file lookup required for select * from them where name='it''s';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: name=it's id=its 
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -374,15 +374,15 @@ routing userx@myhost.test.ex
 --------> r1 router <--------
 local_part=userx domain=myhost.test.ex
 processing address_data
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx'"
-file lookup required for select name from them where id='userx'
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx'"
+ file lookup required for select name from them where id='userx'
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
 calling r1 router
 r1 router called for userx@myhost.test.ex
   domain = myhost.test.ex
@@ -416,15 +416,15 @@ changed uid/gid: local delivery to userx <userx@myhost.test.ex> transport=t1
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1
 appendfile transport entered
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select id from them where id='userx'"
-file lookup required for select id from them where id='userx'
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: userx
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select id from them where id='userx'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select id from them where id='userx'"
+ file lookup required for select id from them where id='userx'
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: userx
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/userx format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
@@ -478,14 +478,14 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
-search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
-  type=sqlite key="select name from them where id='userx';"
-file lookup required for select name from them where id='userx';
-  in TESTSUITE/aux-fixed/sqlitedb
-lookup yielded: Ayen Other
+ search_open: sqlite "TESTSUITE/aux-fixed/sqlitedb"
+ search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   key="select name from them where id='userx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="TESTSUITE/aux-fixed/sqlitedb"
+   type=sqlite key="select name from them where id='userx';"
+ file lookup required for select name from them where id='userx';
+   in TESTSUITE/aux-fixed/sqlitedb
+ lookup yielded: Ayen Other
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2610 b/test/stderr/2610
index f9e073f2f..ef3e0a901 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -2,210 +2,210 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10';"
-database lookup required for select name from them where id='ph10';
-MySQL query: select name from them where id='ph10';
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10';"
-cached data used for lookup of select name from them where id='ph10';
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='xxxx';"
-database lookup required for select name from them where id='xxxx';
-MySQL query: select name from them where id='xxxx';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='nothing';"
-database lookup required for select name from them where id='nothing';
-MySQL query: select name from them where id='nothing';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select id,name from them where id='nothing';"
-database lookup required for select id,name from them where id='nothing';
-MySQL query: select id,name from them where id='nothing';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: id=nothing name="" 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="delete from them where id='nonexist';"
-database lookup required for delete from them where id='nonexist';
-MySQL query: delete from them where id='nonexist';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: query was not one that returns data
-lookup forced cache cleanup
-lookup yielded: 0
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='quote';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='quote';"
-database lookup required for select * from them where id='quote';
-MySQL query: select * from them where id='quote';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='filter';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='filter';"
-database lookup required for select * from them where id='filter';
-MySQL query: select * from them where id='filter';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='quote2';"
-database lookup required for select * from them where id='quote2';
-MySQL query: select * from them where id='quote2';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: name="\"stquot" id=quote2 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='nlonly';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select * from them where id='nlonly';"
-database lookup required for select * from them where id='nlonly';
-MySQL query: select * from them where id='nlonly';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: no data found
-lookup failed
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';"
-database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10';
-MySQL query: servers=x:127.0.0.1::1223; select name from them where id='ph10';
-lookup deferred: MySQL server "x" not found in mysql_servers
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';"
-database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10';
-MySQL query: servers=127.0.0.1::1223:x; select name from them where id='ph10';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';"
-database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
-MySQL query: servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';"
-database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
-MySQL query: servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
-MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';"
-database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
-MySQL query: servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
-MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root
-lookup yielded: Philip Hazel
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-MySQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: Philip Hazel
-Aristotle
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-MySQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-lookup yielded: name="Philip Hazel" id=ph10 
-name=Aristotle id=aaaa 
-search_open: mysql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="delete from them where id='aaaa'"
-database lookup required for delete from them where id='aaaa'
-MySQL query: delete from them where id='aaaa'
-MYSQL using cached connection for 127.0.0.1:1223/test/root
-MYSQL: query was not one that returns data
-lookup forced cache cleanup
-lookup yielded: 1
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10';"
+ database lookup required for select name from them where id='ph10';
+ MySQL query: select name from them where id='ph10';
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10';"
+ cached data used for lookup of select name from them where id='ph10';
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='xxxx';"
+ database lookup required for select name from them where id='xxxx';
+ MySQL query: select name from them where id='xxxx';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='nothing';"
+ database lookup required for select name from them where id='nothing';
+ MySQL query: select name from them where id='nothing';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select id,name from them where id='nothing';"
+ database lookup required for select id,name from them where id='nothing';
+ MySQL query: select id,name from them where id='nothing';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: id=nothing name="" 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="delete from them where id='nonexist';"
+ database lookup required for delete from them where id='nonexist';
+ MySQL query: delete from them where id='nonexist';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: query was not one that returns data
+ lookup forced cache cleanup
+ lookup yielded: 0
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='quote';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='quote';"
+ database lookup required for select * from them where id='quote';
+ MySQL query: select * from them where id='quote';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='filter';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='filter';"
+ database lookup required for select * from them where id='filter';
+ MySQL query: select * from them where id='filter';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='quote2';"
+ database lookup required for select * from them where id='quote2';
+ MySQL query: select * from them where id='quote2';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: name="\"stquot" id=quote2 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='nlonly';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select * from them where id='nlonly';"
+ database lookup required for select * from them where id='nlonly';
+ MySQL query: select * from them where id='nlonly';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: no data found
+ lookup failed
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=x:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=x:127.0.0.1::1223; select name from them where id='ph10';"
+ database lookup required for servers=x:127.0.0.1::1223; select name from them where id='ph10';
+ MySQL query: servers=x:127.0.0.1::1223; select name from them where id='ph10';
+ lookup deferred: MySQL server "x" not found in mysql_servers
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=127.0.0.1::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=127.0.0.1::1223:x; select name from them where id='ph10';"
+ database lookup required for servers=127.0.0.1::1223:x; select name from them where id='ph10';
+ MySQL query: servers=127.0.0.1::1223:x; select name from them where id='ph10';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';"
+ database lookup required for servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
+ MySQL query: servers=127.0.0.1::1223/test/root/:x; select name from them where id='ph10';
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';"
+ database lookup required for servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
+ MySQL query: servers=ip4.ip4.ip4.ip4::1223/test/root/:127.0.0.1::1223; select name from them where id='ph10';
+ MYSQL new connection: host=ip4.ip4.ip4.ip4 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';"
+ database lookup required for servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
+ MySQL query: servers=localhost(TESTSUITE/mysql/sock)/test/root/; select name from them where id='ph10';
+ MYSQL new connection: host=localhost port=0 socket=TESTSUITE/mysql/sock database=test user=root
+ lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ MySQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: Philip Hazel
+ Aristotle
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ MySQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ lookup yielded: name="Philip Hazel" id=ph10 
+ name=Aristotle id=aaaa 
+ search_open: mysql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="delete from them where id='aaaa'"
+ database lookup required for delete from them where id='aaaa'
+ MySQL query: delete from them where id='aaaa'
+ MYSQL using cached connection for 127.0.0.1:1223/test/root
+ MYSQL: query was not one that returns data
+ lookup forced cache cleanup
+ lookup yielded: 1
 search_tidyup called
 close MYSQL connection: localhost(TESTSUITE/mysql/sock)/test/root
 close MYSQL connection: ip4.ip4.ip4.ip4:1223/test/root
@@ -367,16 +367,16 @@ routing ph10@myhost.test.ex
 --------> r1 router <--------
 local_part=ph10 domain=myhost.test.ex
 processing address_data
-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select name from them where id='ph10'"
-database lookup required for select name from them where id='ph10'
-MySQL query: select name from them where id='ph10'
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: Philip Hazel
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select name from them where id='ph10'"
+ database lookup required for select name from them where id='ph10'
+ MySQL query: select name from them where id='ph10'
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: Philip Hazel
 calling r1 router
 r1 router called for ph10@myhost.test.ex
   domain = myhost.test.ex
@@ -411,16 +411,16 @@ changed uid/gid: local delivery to ph10 <ph10@myhost.test.ex> transport=t1
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to ph10 using t1
 appendfile transport entered
-search_open: mysql "NULL"
-search_find: file="NULL"
-  key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=mysql key="select id from them where id='ph10'"
-database lookup required for select id from them where id='ph10'
-MySQL query: select id from them where id='ph10'
-MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
-lookup yielded: ph10
+ search_open: mysql "NULL"
+ search_find: file="NULL"
+   key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=mysql key="select id from them where id='ph10'"
+ database lookup required for select id from them where id='ph10'
+ MySQL query: select id from them where id='ph10'
+ MYSQL new connection: host=127.0.0.1 port=1223 socket=NULL database=test user=root
+ lookup yielded: ph10
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/ph10 format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
diff --git a/test/stderr/2620 b/test/stderr/2620
index 18dffb2ee..f31be1b7f 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -6,197 +6,197 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: pgsql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='ph10';"
-database lookup required for select name from them where id='ph10';
-PostgreSQL query: select name from them where id='ph10';
-PGSQL new connection: host=localhost port=1223 database=test user=CALLER
-lookup yielded: Philip Hazel
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='ph10';"
-cached data used for lookup of select name from them where id='ph10';
-lookup yielded: Philip Hazel
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='xxxx';"
-database lookup required for select name from them where id='xxxx';
-PostgreSQL query: select name from them where id='xxxx';
-PGSQL using cached connection for localhost:1223/test/CALLER
-PGSQL: no data found
-lookup failed
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='nothing';"
-database lookup required for select name from them where id='nothing';
-PostgreSQL query: select name from them where id='nothing';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select id,name from them where id='nothing';"
-database lookup required for select id,name from them where id='nothing';
-PostgreSQL query: select id,name from them where id='nothing';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: id=nothing name="" 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="delete from them where id='nonexist';"
-database lookup required for delete from them where id='nonexist';
-PostgreSQL query: delete from them where id='nonexist';
-PGSQL using cached connection for localhost:1223/test/CALLER
-PGSQL: command does not return any data but was successful. Rows affected: 0
-lookup forced cache cleanup
-lookup yielded: 0
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select * from them where id='quote2';"
-database lookup required for select * from them where id='quote2';
-PostgreSQL query: select * from them where id='quote2';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: name="\"stquot" id=quote2 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select * from them where id='newline';"
-database lookup required for select * from them where id='newline';
-PostgreSQL query: select * from them where id='newline';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: name="before
-after" id=newline 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select * from them where id='tab';"
-database lookup required for select * from them where id='tab';
-PostgreSQL query: select * from them where id='tab';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: name="x	x" id=tab 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="select * from them where name='''stquot';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select * from them where name='''stquot';"
-database lookup required for select * from them where name='''stquot';
-PostgreSQL query: select * from them where name='''stquot';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: name='stquot id=quote1 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=x:localhost; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="servers=x:localhost; select name from them where id='ph10';"
-database lookup required for servers=x:localhost; select name from them where id='ph10';
-PostgreSQL query: servers=x:localhost; select name from them where id='ph10';
-lookup deferred: PostgreSQL server "x" not found in pgsql_servers
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';"
-database lookup required for servers=localhost::1223:x; select name from them where id='ph10';
-PostgreSQL query: servers=localhost::1223:x; select name from them where id='ph10';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: Philip Hazel
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';"
-database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
-PostgreSQL query: servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: Philip Hazel
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';"
-database lookup required for servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
-PostgreSQL query: servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
-PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
-lookup yielded: Philip Hazel
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-PostgreSQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: Philip Hazel
-Aristotle
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
-database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-PostgreSQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
-PGSQL using cached connection for localhost:1223/test/CALLER
-lookup yielded: name="Philip Hazel" id=ph10 
-name=Aristotle id=aaaa 
-search_open: pgsql "NULL"
-  cached open
-search_find: file="NULL"
-  key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="delete from them where id='aaaa'"
-database lookup required for delete from them where id='aaaa'
-PostgreSQL query: delete from them where id='aaaa'
-PGSQL using cached connection for localhost:1223/test/CALLER
-PGSQL: command does not return any data but was successful. Rows affected: 1
-lookup forced cache cleanup
-lookup yielded: 1
+ search_open: pgsql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='ph10';"
+ database lookup required for select name from them where id='ph10';
+ PostgreSQL query: select name from them where id='ph10';
+ PGSQL new connection: host=localhost port=1223 database=test user=CALLER
+ lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='ph10';"
+ cached data used for lookup of select name from them where id='ph10';
+ lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='xxxx';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='xxxx';"
+ database lookup required for select name from them where id='xxxx';
+ PostgreSQL query: select name from them where id='xxxx';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: no data found
+ lookup failed
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='nothing';"
+ database lookup required for select name from them where id='nothing';
+ PostgreSQL query: select name from them where id='nothing';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select id,name from them where id='nothing';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select id,name from them where id='nothing';"
+ database lookup required for select id,name from them where id='nothing';
+ PostgreSQL query: select id,name from them where id='nothing';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: id=nothing name="" 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='nonexist';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="delete from them where id='nonexist';"
+ database lookup required for delete from them where id='nonexist';
+ PostgreSQL query: delete from them where id='nonexist';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: command does not return any data but was successful. Rows affected: 0
+ lookup forced cache cleanup
+ lookup yielded: 0
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='quote2';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select * from them where id='quote2';"
+ database lookup required for select * from them where id='quote2';
+ PostgreSQL query: select * from them where id='quote2';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: name="\"stquot" id=quote2 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='newline';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select * from them where id='newline';"
+ database lookup required for select * from them where id='newline';
+ PostgreSQL query: select * from them where id='newline';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: name="before
+ after" id=newline 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where id='tab';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select * from them where id='tab';"
+ database lookup required for select * from them where id='tab';
+ PostgreSQL query: select * from them where id='tab';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: name="x	x" id=tab 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="select * from them where name='''stquot';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select * from them where name='''stquot';"
+ database lookup required for select * from them where name='''stquot';
+ PostgreSQL query: select * from them where name='''stquot';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: name='stquot id=quote1 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=x:localhost; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="servers=x:localhost; select name from them where id='ph10';"
+ database lookup required for servers=x:localhost; select name from them where id='ph10';
+ PostgreSQL query: servers=x:localhost; select name from them where id='ph10';
+ lookup deferred: PostgreSQL server "x" not found in pgsql_servers
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=localhost::1223:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="servers=localhost::1223:x; select name from them where id='ph10';"
+ database lookup required for servers=localhost::1223:x; select name from them where id='ph10';
+ PostgreSQL query: servers=localhost::1223:x; select name from them where id='ph10';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';"
+ database lookup required for servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
+ PostgreSQL query: servers=localhost::1223/test/CALLER/:x; select name from them where id='ph10';
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';"
+ database lookup required for servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
+ PostgreSQL query: servers=(TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER/:x; select name from them where id='ph10';
+ PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
+ lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="SELECT name FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ PostgreSQL query: SELECT name FROM them WHERE id IN ('ph10', 'aaaa');
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: Philip Hazel
+ Aristotle
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');"
+ database lookup required for SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ PostgreSQL query: SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ lookup yielded: name="Philip Hazel" id=ph10 
+ name=Aristotle id=aaaa 
+ search_open: pgsql "NULL"
+   cached open
+ search_find: file="NULL"
+   key="delete from them where id='aaaa'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="delete from them where id='aaaa'"
+ database lookup required for delete from them where id='aaaa'
+ PostgreSQL query: delete from them where id='aaaa'
+ PGSQL using cached connection for localhost:1223/test/CALLER
+ PGSQL: command does not return any data but was successful. Rows affected: 1
+ lookup forced cache cleanup
+ lookup yielded: 1
 search_tidyup called
 close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER
 close PGSQL connection: localhost:1223/test/CALLER
@@ -385,16 +385,16 @@ routing CALLER@myhost.test.ex
 --------> r1 router <--------
 local_part=CALLER domain=myhost.test.ex
 processing address_data
-search_open: pgsql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='ph10'"
-database lookup required for select name from them where id='ph10'
-PostgreSQL query: select name from them where id='ph10'
-PGSQL new connection: host=localhost port=1223 database=test user=CALLER
-lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='ph10'"
+ database lookup required for select name from them where id='ph10'
+ PostgreSQL query: select name from them where id='ph10'
+ PGSQL new connection: host=localhost port=1223 database=test user=CALLER
+ lookup yielded: Philip Hazel
 calling r1 router
 r1 router called for CALLER@myhost.test.ex
   domain = myhost.test.ex
@@ -429,16 +429,16 @@ changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t1
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-0005vi-00 to CALLER using t1
 appendfile transport entered
-search_open: pgsql "NULL"
-search_find: file="NULL"
-  key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select id from them where id='ph10'"
-database lookup required for select id from them where id='ph10'
-PostgreSQL query: select id from them where id='ph10'
-PGSQL new connection: host=localhost port=1223 database=test user=CALLER
-lookup yielded: ph10
+ search_open: pgsql "NULL"
+ search_find: file="NULL"
+   key="select id from them where id='ph10'" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select id from them where id='ph10'"
+ database lookup required for select id from them where id='ph10'
+ PostgreSQL query: select id from them where id='ph10'
+ PGSQL new connection: host=localhost port=1223 database=test user=CALLER
+ lookup yielded: ph10
 appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   file=TESTSUITE/test-mail/ph10 format=unix
   message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
@@ -493,16 +493,16 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-search_open: pgsql "NULL"
-search_find: file="NULL"
-  key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=pgsql key="select name from them where id='ph10';"
-database lookup required for select name from them where id='ph10';
-PostgreSQL query: select name from them where id='ph10';
-PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
-lookup yielded: Philip Hazel
+ search_open: pgsql "NULL"
+ search_find: file="NULL"
+   key="select name from them where id='ph10';" partial=-1 affix=NULL starflags=0
+ LRU list:
+ internal_search_find: file="NULL"
+   type=pgsql key="select name from them where id='ph10';"
+ database lookup required for select name from them where id='ph10';
+ PostgreSQL query: select name from them where id='ph10';
+ PGSQL new connection: socket=TESTSUITE/pgsql/.s.PGSQL.1223 database=test user=CALLER
+ lookup yielded: Philip Hazel
 search_tidyup called
 close PGSQL connection: (TESTSUITE/pgsql/.s.PGSQL.1223)/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3212 b/test/stderr/3212
index 78d8baf67..3de941ee0 100644
--- a/test/stderr/3212
+++ b/test/stderr/3212
@@ -6,132 +6,132 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-file lookup required for list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-file lookup required for root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-database lookup required for something
-lookup yielded: something
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-cached data used for lookup of something
-lookup yielded: something
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="nocache" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="nocache"
-database lookup required for nocache
-lookup forced cache cleanup
-lookup yielded: nocache
-search_open: testdb "NULL"
-  cached open
-search_find: file="NULL"
-  key="something" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="NULL"
-  type=testdb key="something"
-database lookup required for something
-lookup yielded: something
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="list" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="list"
-cached data used for lookup of list
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx, usery
-search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
-  cached open
-search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  key="root" partial=-1 affix=NULL starflags=0
-LRU list:
-  0TESTSUITE/aux-fixed/3212.aliases
-  End
-internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
-  type=lsearch key="root"
-cached data used for lookup of root
-  in TESTSUITE/aux-fixed/3212.aliases
-lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list"
+ file lookup required for list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root"
+ file lookup required for root
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root"
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something"
+ database lookup required for something
+ lookup yielded: something
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something"
+ cached data used for lookup of something
+ lookup yielded: something
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="nocache" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="nocache"
+ database lookup required for nocache
+ lookup forced cache cleanup
+ lookup yielded: nocache
+ search_open: testdb "NULL"
+   cached open
+ search_find: file="NULL"
+   key="something" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="NULL"
+   type=testdb key="something"
+ database lookup required for something
+ lookup yielded: something
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="list" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="list"
+ cached data used for lookup of list
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx, usery
+ search_open: lsearch "TESTSUITE/aux-fixed/3212.aliases"
+   cached open
+ search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   key="root" partial=-1 affix=NULL starflags=0
+ LRU list:
+   0TESTSUITE/aux-fixed/3212.aliases
+   End
+ internal_search_find: file="TESTSUITE/aux-fixed/3212.aliases"
+   type=lsearch key="root"
+ cached data used for lookup of root
+   in TESTSUITE/aux-fixed/3212.aliases
+ lookup yielded: userx
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>