Not for this PR, but wonder if as a follow up you want to extract the other two cases of this if into their own methods too, with `onMatchMethodInvocation(...)` as just a dispatcher.