Various changes, including getting rid of some half-assed GNU Emacs formatting