More use-package cleanup.