Change whitespace, make condition explicit in hopes of being more POSIX stable