@@ -198,7 +198,8 @@ in the past.  I often find it useful when I remember writing something
 a particular way, but it changed later.
 
 #+BEGIN_SRC emacs-lisp
-  (use-package git-timemachine)
+  (use-package git-timemachine
+    :commands git-timemachine)
 #+END_SRC
 
 * Styles
@@ -1217,6 +1218,9 @@ don’t use it directly.
 
 #+BEGIN_SRC emacs-lisp
   (use-package smex
+    :commands (smex
+               smex-update
+               smex-initialize)
     :config (progn
               (setq smex-key-advice-ignore-menu-bar t
                     smex-auto-update nil)
@@ -1616,6 +1620,7 @@ Go has a few packages to inter-operate with other emacs packages.
 
 #+BEGIN_SRC emacs-lisp
   (use-package company-go
+    :commands company-go
     :config (progn
               (setq company-go-show-annotation t))
     :init (progn
@@ -1625,6 +1630,7 @@ '(company-go)))
             (add-hook 'go-mode-hook #'ap/company-go-setup)))
 
   (use-package go-eldoc
+    :commands go-eldoc-setup
     :init (progn
             (add-hook 'go-mode-hook #'go-eldoc-setup)))
 
@@ -1978,6 +1984,7 @@
 #+BEGIN_SRC emacs-lisp
   (use-package mmm-auto
     :ensure mmm-mode
+    :defer 20
     :config (progn
               (mmm-add-classes
                '((php-sql