Now that all output should end in a newline, we don't need to play
tricks with getting certain escape codes out ahead of buffered output.
This updates what we tried to do in commit
991b83d23cf014226aa97f01f4290a6e6554fee1.
This partially reverts commit
8056125077d5a2583272219d193b94e81c97a50c.