Fix white space and line-ending issues introduced in #724