Here's another instance of config breakage; we definitely have people using the `matches` argument here. Can we do another deprecation warning and leave it for now (i.e. just build a MatchList or something if there is more than one Match there)?