Added so #7714 also takes care of args... when considering a match.