Updates to matching for name uses and method calls.