diff --git a/cppcheck.sup b/cppcheck.sup
index 514c51d82..002ac0e77 100644
--- a/cppcheck.sup
+++ b/cppcheck.sup
@@ -1,3 +1,3 @@
 // These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:4347
-thisSubtraction:netlist.h:4356
+thisSubtraction:netlist.h:4430
+thisSubtraction:netlist.h:4439
diff --git a/elab_net.cc b/elab_net.cc
index 6cc0ed66c..6d39f8f4c 100644
--- a/elab_net.cc
+++ b/elab_net.cc
@@ -553,7 +553,7 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 	      // itself.
 	    ivl_assert(*this, member->packed_dims.size() <= 1);
 	    ivl_assert(*this, path_tail.index.size() <= 1);
-	    if (path_tail.index.size() > 0) {
+	    if (! path_tail.index.empty()) {
 		  long tmp_off;
 		  unsigned long tmp_wid;
 		  const index_component_t&tail_sel = path_tail.index.back();