Make some modules conform to linting
Fix emacs_keybindings reference for lint