diff --git a/cpp/mwmatching.h b/cpp/mwmatching.h
index 2ff4ba3..dcfd45b 100644
--- a/cpp/mwmatching.h
+++ b/cpp/mwmatching.h
@@ -691,10 +691,8 @@ struct MatchingContext
     void lset_new_blossom(BlossomT* blossom)
     {
         assert(blossom->best_edge == nullptr);
-        NonTrivialBlossomT* ntb = blossom->nontrivial();
-        if (ntb) {
-            assert(ntb->best_edge_set.empty());
-        }
+        assert((blossom->nontrivial() == nullptr)
+               || blossom->nontrivial()->best_edge_set.empty());
     }
 
     /**
@@ -743,8 +741,7 @@ struct MatchingContext
                 } else {
                     // Trivial blossoms don't maintain a least-slack edge set.
                     // Just consider all incident edges.
-                    for (const EdgeT* edge :
-                            adjacent_edges[sub->base_vertex]) {
+                    for (const EdgeT* edge : adjacent_edges[sub->base_vertex]) {
                         // Only take edges between different S-blossoms.
                         VertexId x = edge->vt.first;
                         VertexId y = edge->vt.second;