Cleanup comments.
Remove extra key-def.
Add missing requires for find-library-name.
Fix checkdoc-errors.
Add user-init-file to front of possible init files.
Undo user-init-file change.