Not sure how backward compatible it is. All the tests pass if that's what you mean. If you can check it works for your use case, I wouldn't mind having this be "the way". If that's not appealing, I can add a `mode` argument to allow the old simple substring matching behavior.