Improved method call matching to look in more places.