diff --git a/examples/pdf-mod-info.cc b/examples/pdf-mod-info.cc
index 9ffd4ed..2f15279 100644
--- a/examples/pdf-mod-info.cc
+++ b/examples/pdf-mod-info.cc
@@ -40,25 +40,22 @@ void dumpInfoDict(QPDF& pdf,
     if (trailer.hasKey("/Info"))
     {
 	QPDFObjectHandle info = trailer.getKey("/Info");
-	std::set<std::string> keys = info.getKeys();
-	for (std::set<std::string>::const_iterator it = keys.begin();
-	     keys.end() != it; ++it)
+	for (auto& it: QPDFDictItems(info))
 	{
-	    QPDFObjectHandle elt = info.getKey(*it);
 	    std::string val;
-	    if (elt.isString())
+	    if (it.second.isString())
 	    {
-		val = elt.getStringValue();
+		val = it.second.getStringValue();
 	    }
-	    else if (elt.isName())
+	    else if (it.second.isName())
 	    {
-		val = elt.getName();
+		val = it.second.getName();
 	    }
 	    else // according to PDF Spec 1.5, shouldn't happen
 	    {
-		val = elt.unparseResolved();
+		val = it.second.unparseResolved();
 	    }
-	    os << it->substr(1) << sep << val << std::endl; // skip '/'
+	    os << it.first.substr(1) << sep << val << std::endl; // skip '/'
 	}
     }
 }