diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75eeb632adb..e1e8bc385cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-28  Nathan Sidwell  <nathan@acm.org>
+
+	* gimple-pretty-print.c (dump_gimple_call_args): Simplify "' "
+	printing.
+
 2016-09-28  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	PR tree-optimization/61056
diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index 10cb168af74..10bf80139b6 100644
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -649,26 +649,21 @@ dump_gimple_call_args (pretty_printer *buffer, gcall *gs, int flags)
 	    {
 	      i++;
 	      pp_string (buffer, enums[v]);
-	      if (i < gimple_call_num_args (gs))
-		pp_string (buffer, ", ");
 	    }
 	}
     }
 
   for (; i < gimple_call_num_args (gs); i++)
     {
-      dump_generic_node (buffer, gimple_call_arg (gs, i), 0, flags, false);
-      if (i < gimple_call_num_args (gs) - 1)
+      if (i)
 	pp_string (buffer, ", ");
+      dump_generic_node (buffer, gimple_call_arg (gs, i), 0, flags, false);
     }
 
   if (gimple_call_va_arg_pack_p (gs))
     {
-      if (gimple_call_num_args (gs) > 0)
-        {
-          pp_comma (buffer);
-          pp_space (buffer);
-        }
+      if (i)
+	pp_string (buffer, ", ");
 
       pp_string (buffer, "__builtin_va_arg_pack ()");
     }