Fix -Wsign-compare warning and remove windows-style line endings introduced by r185421