Hello,

This patch zaps a few more instances of function.cfunc in the core-code. 
  It isn't elegant but hopefully it is better than the existing code.

Ok?

Andrew