Recent work on method references opened up possibilities for cleaning up all methods related to overload resolution in Resolve.java. All those methods can be rewritten as special cases of a more general overload resolution routine that delegates routine-dependent tasks to a LookupHelper instance.