Formatting cleanup.

The only thing I hate more than tabs? Mixing tabs with spaces. (Well, I
suppose I can tolerate tabs for indentation, spaces everywhere else, but
that doesn't work in Elisp.) Not sure what I will do about lines longer
than 80 characters yet.