custom.el: changes from upgrading ELPA packages