cl-lib.el: Partial revert of "2015-04-05 Rationalize c[ad]+r"