Least possible changes for package.el compatibility