More fixing of newlines.