Make deadlock detector more reliable, and more concise.Signed-off-by: Ross Allan <[email protected]> (commit: 5e87dbe)