In Emacs, we have made all the `foo-load-hook' variables obsolete in
favor of `with-eval-after-load'.  The attached patch does the same for
org-mode.