DRY
Roll up logic, add missing wildcards.