*Really* fix DOS newlines introduced in r210330

r210369 didn't quite catch all of them.