Fix also the other if-any, and the failure to stop caused by the last change.