Refactor to use the after macro instead of eval-after-load.  Just a tidy-up.