Slightly simplify wildcard handling