Strip extraneous spaces, update line endings again