Wouldn't this also catch the conditions when both the frequency and day_of_week/day_of_month are supplied?