Cleanup indentation and comments
Wrap long line
Use custom format strings for with-demoted-errors

Makes it easier to identify the cause of an error in 24.4, and is still
compatible with earlier Emacsen, because literal strings are in
expression bodies.
Fix headline levels in test suite
Add tests for proper indentation of source/test code