little cleanups so my emacs can bootstrap itself