More places that should be using stubbed time.