IDE-1607 Better method matching