Start conversion to use-package from 'after' macros