I'm not completely sure, but probably not. I'd like to get rid of this check, but these patches are really just preparation for the 5th patch in this series. I know there are other places where we check for a NULL pFunction (including use_vs()), I'd like to remove those all at once.
Fair enough