[emacs][wip] fix up some breakages due to use-package-always-defer