diff --git a/src/emitter.cpp b/src/emitter.cpp
index ebeb059..6872252 100644
--- a/src/emitter.cpp
+++ b/src/emitter.cpp
@@ -285,10 +285,8 @@ void Emitter::PrepareTopNode(EmitterNodeType::value child) {
   if (child == EmitterNodeType::NoType)
     return;
 
-  if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0) {
-    if (child != EmitterNodeType::NoType)
-      EmitBeginDoc();
-  }
+  if (m_pState->CurGroupChildCount() > 0 && m_stream.col() > 0)
+    EmitBeginDoc();
 
   switch (child) {
     case EmitterNodeType::NoType:
diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp
index fffb775..e02931f 100644
--- a/src/emitterutils.cpp
+++ b/src/emitterutils.cpp
@@ -382,7 +382,7 @@ bool WriteChar(ostream_wrapper& out, char ch) {
     out << "\"\\b\"";
   } else if (ch == '\\') {
     out << "\"\\\\\"";
-  } else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') {
+  } else if (0x20 <= ch && ch <= 0x7e) {
     out << "\"" << ch << "\"";
   } else {
     out << "\"";
diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp
index 10e359d..e5b0973 100644
--- a/src/scanscalar.cpp
+++ b/src/scanscalar.cpp
@@ -183,7 +183,7 @@ std::string ScanScalar(Stream& INPUT, ScanScalarParams& params) {
         case FOLD_FLOW:
           if (nextEmptyLine) {
             scalar += "\n";
-          } else if (!emptyLine && !nextEmptyLine && !escapedNewline) {
+          } else if (!emptyLine && !escapedNewline) {
             scalar += " ";
           }
           break;