Be more selective when we fix up prefixes for 'wildcard' clients