* lisp/emacs-lisp/macroexp.el: Tweak macroexp-if optimizations