Is the issue that `check-for-success` doesn't like it when `match-pred` is nil?  If so, I think we should just fix that instead.