Cleaner file endings for #1077.