Fix whitespace issues.

And add emacs modelines to make it not happen again.