Follow-up r54966: more sanity checks