diff --git a/examples/pdf-bookmarks.cc b/examples/pdf-bookmarks.cc
index 9581a135..87a3b9d4 100644
--- a/examples/pdf-bookmarks.cc
+++ b/examples/pdf-bookmarks.cc
@@ -50,7 +50,7 @@ generate_page_map(QPDF& qpdf)
     QPDFPageDocumentHelper dh(qpdf);
     int n = 0;
     for (auto const& page: dh.getAllPages()) {
-        page_map[page.getObjectHandle().getObjGen()] = ++n;
+        page_map[page] = ++n;
     }
 }
 
@@ -104,15 +104,14 @@ show_bookmark_details(QPDFOutlineObjectHelper outline, std::vector<int> numbers)
         QPDFObjectHandle dest_page = outline.getDestPage();
         if (!dest_page.isNull()) {
             QTC::TC("examples", "pdf-bookmarks dest");
-            QPDFObjGen og = dest_page.getObjGen();
-            if (page_map.count(og)) {
-                target = std::to_string(page_map[og]);
+            if (page_map.count(dest_page)) {
+                target = std::to_string(page_map[dest_page]);
             }
         }
         std::cout << "[ -> " << target << " ] ";
     }
 
-    std::cout << outline.getTitle() << std::endl;
+    std::cout << outline.getTitle() << '\n';
 }
 
 void
diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc
index d3037984..09e115d0 100644
--- a/examples/pdf-invert-images.cc
+++ b/examples/pdf-invert-images.cc
@@ -48,7 +48,7 @@ ImageInverter::registerImage(
     // class from ever being deleted since the reference count will never drop to zero (and
     // std::shared_ptr doesn't have weak references).
 
-    QPDFObjGen og(image.getObjGen());
+    QPDFObjGen og(image);
     // Store information about the images based on the object and generation number. Recall that a
     // single image object may be used more than once, so no need to update the same stream multiple
     // times.
diff --git a/fuzz/qpdf_pages_fuzzer.cc b/fuzz/qpdf_pages_fuzzer.cc
index f1a0db1a..66c8439a 100644
--- a/fuzz/qpdf_pages_fuzzer.cc
+++ b/fuzz/qpdf_pages_fuzzer.cc
@@ -84,13 +84,13 @@ FuzzHelper::testPages()
             pldh.getLabelForPage(pageno);
             QPDFObjectHandle page_obj(page.getObjectHandle());
             page_obj.getJSON(JSON::LATEST, true).unparse();
-            odh.getOutlinesForPage(page_obj.getObjGen());
+            odh.getOutlinesForPage(page_obj);
 
             for (auto& aoh: afdh.getWidgetAnnotationsForPage(page)) {
                 afdh.getFieldForAnnotation(aoh);
             }
         } catch (QPDFExc& e) {
-            std::cerr << "page " << pageno << ": " << e.what() << std::endl;
+            std::cerr << "page " << pageno << ": " << e.what() << '\n';
         }
     }
 }