use-package now works with original construct

Also remove duplication of :if logic.