Update to work with more recent Emacsen