Agree. `lock_timeout` will go a long way in terms of damage control.