diff --git a/vhdlpp/architec_emit.cc b/vhdlpp/architec_emit.cc
index 52ddb7b54..2338bb312 100644
--- a/vhdlpp/architec_emit.cc
+++ b/vhdlpp/architec_emit.cc
@@ -126,7 +126,7 @@ int ProcessStatement::emit(ostream&out, Entity*ent, Architecture*arc)
 
       out << "always";
 
-      if (sensitivity_list_.size() > 0) {
+      if (! sensitivity_list_.empty()) {
 	    out << " @(";
 	    const char*comma = 0;
 	    for (list<Expression*>::iterator cur = sensitivity_list_.begin()
diff --git a/vhdlpp/debug.cc b/vhdlpp/debug.cc
index 54fac14d8..165d89670 100644
--- a/vhdlpp/debug.cc
+++ b/vhdlpp/debug.cc
@@ -57,7 +57,7 @@ void dump_design_entities(ostream&file)
 
 void ComponentBase::dump_ports(ostream&out, int indent) const
 {
-      if (ports_.size() == 0) {
+      if (ports_.empty()) {
 	    out << setw(indent) << "" << "No ports" << endl;
       } else {
 	    out << setw(indent) << "" << "PORTS:" << endl;
diff --git a/vhdlpp/entity.cc b/vhdlpp/entity.cc
index de3846fb2..27033f489 100644
--- a/vhdlpp/entity.cc
+++ b/vhdlpp/entity.cc
@@ -40,7 +40,7 @@ ComponentBase::~ComponentBase()
 
 void ComponentBase::set_interface(std::list<InterfacePort*>*ports)
 {
-	while (ports->size() > 0) {
+	while (! ports->empty()) {
 	      ports_.push_back(ports->front());
 	      ports->pop_front();
 	}
@@ -59,6 +59,7 @@ const InterfacePort* ComponentBase::find_port(perm_string my_name) const
 Entity::Entity(perm_string name)
 : ComponentBase(name)
 {
+      bind_arch_ = 0;
 }
 
 Entity::~Entity()
diff --git a/vhdlpp/entity.h b/vhdlpp/entity.h
index 4d430f7e8..c07d70b7e 100644
--- a/vhdlpp/entity.h
+++ b/vhdlpp/entity.h
@@ -73,7 +73,7 @@ class ComponentBase : public LineInfo {
 
     protected:
 	// This is really only used by the Entity derived class.
-      const std::vector<InterfacePort*>&get_ports() { return ports_; }
+      const std::vector<InterfacePort*>&get_ports() const { return ports_; }
 
     private:
       perm_string name_;
diff --git a/vhdlpp/entity_elaborate.cc b/vhdlpp/entity_elaborate.cc
index d79347b8c..6e738c3bb 100644
--- a/vhdlpp/entity_elaborate.cc
+++ b/vhdlpp/entity_elaborate.cc
@@ -49,7 +49,7 @@ int Entity::elaborate()
       if (verbose_flag)
 	    cerr << "Elaborate entity " << get_name() << "..." << endl;
 
-      if (arch_.size() == 0) {
+      if (arch_.empty()) {
 	    cerr << get_fileline() << ": error: "
 		 << "No architectures to choose from for entity " << get_name()
 		 << "." << endl;
diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y
index e95ad028c..ea4b41815 100644
--- a/vhdlpp/parse.y
+++ b/vhdlpp/parse.y
@@ -97,7 +97,7 @@ static void push_scope(void)
 static void pop_scope(void)
 {
       delete active_scope;
-      assert(scope_stack.size() > 0);
+      assert(! scope_stack.empty());
       active_scope = scope_stack.top();
       scope_stack.pop();
 }
diff --git a/vhdlpp/sequential.cc b/vhdlpp/sequential.cc
index 48b0d3a11..e3c160679 100644
--- a/vhdlpp/sequential.cc
+++ b/vhdlpp/sequential.cc
@@ -61,7 +61,7 @@ IfSequential::~IfSequential()
 
 void IfSequential::extract_true(std::list<SequentialStmt*>&that)
 {
-      while (if_.size() > 0) {
+      while (! if_.empty()) {
 	    that.push_back(if_.front());
 	    if_.pop_front();
       }
@@ -69,7 +69,7 @@ void IfSequential::extract_true(std::list<SequentialStmt*>&that)
 
 void IfSequential::extract_false(std::list<SequentialStmt*>&that)
 {
-      while (else_.size() > 0) {
+      while (! else_.empty()) {
 	    that.push_back(else_.front());
 	    else_.pop_front();
       }
diff --git a/vhdlpp/sequential_emit.cc b/vhdlpp/sequential_emit.cc
index 20aa5adc7..47577c91d 100644
--- a/vhdlpp/sequential_emit.cc
+++ b/vhdlpp/sequential_emit.cc
@@ -49,7 +49,7 @@ int IfSequential::emit(ostream&out, Entity*ent, Architecture*arc)
 	    errors += (*cur)->statement_emit(out, ent, arc);
       }
 
-      if (else_.size() > 0) {
+      if (! else_.empty()) {
 	    out << "end else begin" << endl;
 
 	    for (list<SequentialStmt*>::iterator cur = else_.begin()
diff --git a/vhdlpp/vtype_stream.cc b/vhdlpp/vtype_stream.cc
index 17001a813..a52af9311 100644
--- a/vhdlpp/vtype_stream.cc
+++ b/vhdlpp/vtype_stream.cc
@@ -33,7 +33,7 @@ void VTypeArray::write_to_stream(ostream&fd) const
 	// Special case: std_logic_vector
       if (etype_ == primitive_STDLOGIC) {
 	    fd << "std_logic_vector";
-	    if (ranges_.size() > 0) {
+	    if (! ranges_.empty()) {
 		  assert(ranges_.size() < 2);
 		  fd << " (" << ranges_[0].msb()
 		     << " downto " << ranges_[0].lsb() << ") ";
@@ -42,7 +42,7 @@ void VTypeArray::write_to_stream(ostream&fd) const
       }
 
       fd << "array ";
-      if (ranges_.size() > 0) {
+      if (! ranges_.empty()) {
 	    assert(ranges_.size() < 2);
 	    fd << "(" << ranges_[0].msb()
 	       << " downto " << ranges_[0].lsb() << ") ";