Fix timer usage.

This makes the simulator produce proper summary output again.

Note that this PR goes against the direction I would like for timestep control (moves the last remaining shred of it to the main() function), but it does make the simulator consistent and produce correct output, which is more important.