Improve usage of standard Emacs headers a bit

though perhaps not all that much.