Improve use-package usage for conditional loading.