This seems orthogonal—can we do it separately? (Personally, I actually like to have timid mode still select a good match automatically.)