Cleaned up some other references to "timeout".