diff --git a/utils/TableGen/InfoByHwMode.cpp b/utils/TableGen/InfoByHwMode.cpp
index 7cd1b0f0813..3d236b82803 100644
--- a/utils/TableGen/InfoByHwMode.cpp
+++ b/utils/TableGen/InfoByHwMode.cpp
@@ -91,13 +91,10 @@ void ValueTypeByHwMode::writeToStream(raw_ostream &OS) const {
   llvm::sort(Pairs, deref<std::less<PairType>>());
 
   OS << '{';
-  for (unsigned i = 0, e = Pairs.size(); i != e; ++i) {
-    const PairType *P = Pairs[i];
-    OS << '(' << getModeName(P->first)
-       << ':' << getMVTName(P->second).str() << ')';
-    if (i != e-1)
-      OS << ',';
-  }
+  ListSeparator LS(",");
+  for (const PairType *P : Pairs)
+    OS << LS << '(' << getModeName(P->first) << ':'
+       << getMVTName(P->second).str() << ')';
   OS << '}';
 }
 
@@ -183,12 +180,9 @@ void RegSizeInfoByHwMode::writeToStream(raw_ostream &OS) const {
   llvm::sort(Pairs, deref<std::less<PairType>>());
 
   OS << '{';
-  for (unsigned i = 0, e = Pairs.size(); i != e; ++i) {
-    const PairType *P = Pairs[i];
-    OS << '(' << getModeName(P->first) << ':' << P->second << ')';
-    if (i != e-1)
-      OS << ',';
-  }
+  ListSeparator LS(",");
+  for (const PairType *P : Pairs)
+    OS << LS << '(' << getModeName(P->first) << ':' << P->second << ')';
   OS << '}';
 }