lisp/subr.el: Rework previous change.