[V1] Update function resolution to leverage getInstance method.

[RCHowell]

Function resolution logic must be refined to leverage the getInstance method, however this change will take more time than rc1 warrants. This issue is to follow-up on #1603 to replace the resolution logic.

Note that the resolution logic is internal and the only visible change is the removal of "getType()" from the parameter.