Make it more compliant with package.el