Use @tombentley's NewlineFixingInputStream everywhere