Better method mismatch error messages

Rebase + fix of #10118