No functionality change, just fix whitespace, a typo and remove an unnecessary

emacs mode marker. (Changes left behind from another patch that ended up not
working out.)

llvm-svn: 250666