Move usematch into (add|del)_uplink.