Minor speedup by avoiding callbacks to functions already generated