Dropped timeout_decorator; added TimeoutException catching.