First revision at using wildcards where appropriate to help prevent input list modification