Introducing wildcards where it makes sense