[wip] Try to clean up timeout management.