Add callbacks on functions that really need them instead.