RE: D1428: Rework treatment of wildcards