(unload-feature): Don't remove a function from hooks if it is about to be restored to an autoload . Remove functions that will become unbound from auto-mode-alist. Simplify the code.