Various changes, including support for trimming windows carriage returns.