Slightly clearer output.

src/jrd/recsrc/RecursiveStream.cpp

@@ -248,13 +248,22 @@ void RecursiveStream::print(thread_db* tdbb, string& plan, bool detailed, unsign
 	}
 	else
 	{
-		level++;
+		if (!level)
+		{
 			plan += "(";
-		m_root->print(tdbb, plan, false, level);
+		}
+
+		m_root->print(tdbb, plan, false, level + 1);
+
 		plan += ", ";
-		m_inner->print(tdbb, plan, false, level);
+
+		m_inner->print(tdbb, plan, false, level + 1);
+
+		if (!level)
+		{
 			plan += ")";
 		}
+	}
 }
 
 void RecursiveStream::markRecursive()

src/jrd/recsrc/Union.cpp

@@ -176,6 +176,7 @@ void Union::print(thread_db* tdbb, string& plan, bool detailed, unsigned level)
 	if (detailed)
 	{
 		plan += printIndent(++level) + "Union";
+
 		for (size_t i = 0; i < m_args.getCount(); i++)
 		{
 			m_args[i]->print(tdbb, plan, true, level);
@@ -183,18 +184,26 @@ void Union::print(thread_db* tdbb, string& plan, bool detailed, unsigned level)
 	}
 	else
 	{
-		level++;
+		if (!level)
+		{
 			plan += "(";
+		}
+
 		for (size_t i = 0; i < m_args.getCount(); i++)
 		{
 			if (i)
 			{
 				plan += ", ";
 			}
-			m_args[i]->print(tdbb, plan, false, level);
+
+			m_args[i]->print(tdbb, plan, false, level + 1);
 		}
+
+		if (!level)
+		{
 			plan += ")";
 		}
+	}
 }
 
 void Union::markRecursive()

src/jrd/recsrc/WindowedStream.cpp

@@ -361,14 +361,24 @@ namespace
 			m_inner->print(tdbb, plan, true, level + 1);
 		}
 		else
+		{
+			if (!level)
 			{
 				plan += "(";
+			}
+
 			m_outer->print(tdbb, plan, false, level + 1);
+
 			plan += ", ";
+
 			m_inner->print(tdbb, plan, false, level + 1);
+
+			if (!level)
+			{
 				plan += ")";
 			}
 		}
+	}
 
 	void WindowJoin::markRecursive()
 	{