Emacs: a couple small snippet enhancements

Man, these snippets suck.  Maybe I should just blow away everything and
start over...