Bugfixes for the new restart code in bench_handle_timer().