Fixed an embarrassing deadlock when restarting crashed threads.
Fixed a goof where we weren't really honoring a deadline.