diff --git a/cppcheck.sup b/cppcheck.sup
index 9d2cbc034..8bbd27e6e 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:4863
-thisSubtraction:netlist.h:4872
+thisSubtraction:netlist.h:4938
+thisSubtraction:netlist.h:4947
diff --git a/elab_lval.cc b/elab_lval.cc
index 6d647652c..fdbe36354 100644
--- a/elab_lval.cc
+++ b/elab_lval.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2013 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2014 Stephen Williams (steve@icarus.com)
  * Copyright CERN 2012-2013 / Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
@@ -421,7 +421,7 @@ NetAssign_* PEIdent::elaborate_lval_method_class_member_(Design*des,
       }
 
       NetExpr*canon_index = 0;
-      if (name_comp.index.size() > 0) {
+      if (! name_comp.index.empty()) {
 	    ivl_type_t property_type = class_type->get_prop_type(pidx);
 
 	    if (const netsarray_t* stype = dynamic_cast<const netsarray_t*> (property_type)) {
diff --git a/vvp/vvp_darray.cc b/vvp/vvp_darray.cc
index 247bc0722..a3ec8f6f7 100644
--- a/vvp/vvp_darray.cc
+++ b/vvp/vvp_darray.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2012-2014 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -244,7 +244,7 @@ void vvp_queue_string::set_word(unsigned adr, const string&value)
 
       list<string>::iterator cur = array_.begin();
       while (adr > 0) {
-	    cur ++;
+	    ++ cur;
 	    adr -= 1;
       }
 
@@ -260,7 +260,7 @@ void vvp_queue_string::get_word(unsigned adr, string&value)
 
       list<string>::const_iterator cur = array_.begin();
       while (adr > 0) {
-	    cur ++;
+	    ++ cur;
 	    adr -= 1;
       }
 
@@ -293,7 +293,7 @@ void vvp_queue_vec4::set_word(unsigned adr, const vvp_vector4_t&value)
 
       list<vvp_vector4_t>::iterator cur = array_.begin();
       while (adr > 0) {
-	    cur ++;
+	    ++ cur;
 	    adr -= 1;
       }
 
@@ -309,7 +309,7 @@ void vvp_queue_vec4::get_word(unsigned adr, vvp_vector4_t&value)
 
       list<vvp_vector4_t>::const_iterator cur = array_.begin();
       while (adr > 0) {
-	    cur ++;
+	    ++ cur;
 	    adr -= 1;
       }