Still more line ending cleanup (related to DS-1587)