Fix linebreak and whitespace issues to placate make tidy.