Emacs+ 4.1.5

A few sexp and case fixes