1993a67381
* Fix TODO syntax. * Clarify messages for some timeouts, to aid debugging. * Increase some other timeouts that were a needlessly short, to reduce sources of flakes. * Remove some more timeouts that were mostly redundant, to remove complexity. * Minor style cleanup. * Remove some dangerous traps (specifically, hide the explicit start/end times in TimedEvent since they shouldn't matter).