--- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
+++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
@@ -200,7 +200,7 @@ namespace apvlv
 
     if (len >= 4
 	&& *s == '<'
-	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
+	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
       {
 	e++;
 	StringKeyMap::iterator it;
--- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
+++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
@@ -90,7 +90,7 @@ namespace apvlv
   {
     mInuse = use;
 
-    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
+    if (mInuse == false && !gView->hasloaded (filename (), type ()))
       {
 	debug ("core :%p is not needed, delete it\n", this);
 	delete this;