Use a different method of updating the next run's current_start_time in the face of retries with timeouts

Fixes #1 (in precisely the way outlined in the comment on said issue).