More sane handling of cases with no line numbers.
Formatting fixes on new files.