Simplified, expanded DHCP matches