d4664af4e5
Move the composite substitutor to GenericCandidateResolver where it was used, other places don't need it since they know the exact call (or NO_CALL), the substitutor for which should be used