If we already have funcs generated, let the pillar use them

By simply re-ordering things a little, we can save an average of ~0.09s per salt-call