Fix more of #2133 \r\r\n line endings.