Some more Win32 Terminal fixes

Almost there, the main issue remaining is when running from a
command-line, it sometimes "unwraps" lines.