Only add \r when necessary.
Progress might be a problem with both stdout and stderr. Hmmn.