Fix some newly introduced whitespace issues