Make DelayedCalls work better.