Clean up spacing to pass Emacs's pre-commit check