Make MELPA happy at the expense of making emacs's byte compiler less happy.