More line ending cleanup (related to changes in DS-1587)