Improve matching of method decls and invokes