diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 6ef144253..37737f738 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -833,7 +833,7 @@ void CheckBufferOverrun::arrayIndexInForLoop(const Token *tok, const ArrayInfo &
 
             for (const Token *loopTok = tok3->tokAt(2); loopTok->str() != "}" ; loopTok = loopTok->next()) {
                 if (usedInArray && (counter_varid == loopTok->varId())) {
-                    if (Token::Match(loopTok->next(), " ++ ") ||
+                    if (loopTok->strAt(1) == "++" ||
                         (loopTok->previous()->type() == Token::eIncDecOp)) {
                         bufferOverrunError(tok, arrayInfo.varname());
                     }
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index dd06c125d..18a66fca0 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -241,7 +241,7 @@ void CheckOther::clarifyStatement()
         if (Token::Match(tok, "* %var%")) {
             const Token *tok2=tok->previous();
 
-            while (Token::Match(tok2, "*"))
+            while (tok2 && tok2->str() == "*")
                 tok2=tok2->previous();
 
             if (Token::Match(tok2, "[{};]")) {
@@ -649,8 +649,6 @@ void CheckOther::checkRedundantAssignment()
         if (!scope->isExecutable())
             continue;
 
-        ///std::cout << std::endl << "scope: " << i->className << std::endl;
-
         std::map<unsigned int, const Token*> varAssignments;
         std::map<unsigned int, const Token*> memAssignments;
         const Token* writtenArgumentsEnd = 0;
@@ -671,7 +669,6 @@ void CheckOther::checkRedundantAssignment()
             } else if (tok->type() == Token::eVariable) {
                 std::map<unsigned int, const Token*>::iterator it = varAssignments.find(tok->varId());
                 if (tok->next()->isAssignmentOp() && Token::Match(tok->previous(), "[;{}]")) { // Assignment
-                    ///std::cout << "assign: " << tok->varId() << std::endl;
                     if (it != varAssignments.end()) {
                         bool error = true; // Ensure that variable is not used on right side
                         for (const Token* tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) {
@@ -693,8 +690,7 @@ void CheckOther::checkRedundantAssignment()
                 } else if (tok->next()->type() == Token::eIncDecOp || (tok->previous()->type() == Token::eIncDecOp && !Token::Match(tok->next(), ".|[|("))) { // Variable incremented/decremented
                     varAssignments[tok->varId()] = tok;
                     memAssignments.erase(tok->varId());
-                } else if (!Token::Match(tok->tokAt(-2), "sizeof (")) { // Other usage of variable
-                    ///std::cout << "use: " << tok->varId() << std::endl;
+                } else if (!Token::simpleMatch(tok->tokAt(-2), "sizeof (")) { // Other usage of variable
                     if (it != varAssignments.end())
                         varAssignments.erase(it);
                     if (!writtenArgumentsEnd) // Indicates that we are in the first argument of strcpy/memcpy/... function
@@ -1893,7 +1889,7 @@ void CheckOther::checkConstantFunctionParameter()
         //       const stream parameter).
         if (Token::Match(tok, "std :: string|wstring")) {
             passedByValueError(tok, var->name());
-        } else if (Token::Match(tok, "std :: %type% <") && !Token::Match(tok->linkAt(3), "> ::")) {
+        } else if (Token::Match(tok, "std :: %type% <") && !Token::simpleMatch(tok->linkAt(3), "> ::")) {
             passedByValueError(tok, var->name());
         } else if (var->type() || symbolDatabase->isClassOrStruct(tok->str())) {  // Check if type is a struct or class.
             passedByValueError(tok, var->name());
@@ -3075,7 +3071,7 @@ void CheckOther::sizeofCalculation()
         if (Token::simpleMatch(tok, "sizeof (")) {
             const Token* const end = tok->linkAt(1);
             for (const Token *tok2 = tok->tokAt(2); tok2 != end; tok2 = tok2->next()) {
-                if (tok2->isOp() && (!tok2->isExpandedMacro() || _settings->inconclusive) && !Token::Match(tok2, ">|<|&") && (Token::Match(tok2->previous(), "%var%") || !Token::Match(tok2, "*"))) {
+                if (tok2->isOp() && (!tok2->isExpandedMacro() || _settings->inconclusive) && !Token::Match(tok2, ">|<|&") && (Token::Match(tok2->previous(), "%var%") || tok2->str() != "*")) {
                     if (!(Token::Match(tok2->previous(), "%type%") || Token::Match(tok2->next(), "%type%"))) {
                         sizeofCalculationError(tok2, tok2->isExpandedMacro());
                         break;
@@ -3370,7 +3366,7 @@ void CheckOther::checkIncompleteArrayFill()
 
             if (MathLib::toLongNumber(tok->linkAt(1)->strAt(-1)) == var->dimension(0)) {
                 unsigned int size = _tokenizer->sizeOfType(var->typeStartToken());
-                if ((size != 1 && size != 100 && size != 0) || Token::Match(var->typeEndToken(), "*"))
+                if ((size != 1 && size != 100 && size != 0) || var->typeEndToken()->str() == "*")
                     incompleteArrayFillError(tok, var->name(), tok->str(), false);
                 else if (var->typeStartToken()->str() == "bool" && _settings->isEnabled("portability")) // sizeof(bool) is not 1 on all platforms
                     incompleteArrayFillError(tok, var->name(), tok->str(), true);
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
index d7fee1972..95870c049 100644
--- a/lib/checkunusedvar.cpp
+++ b/lib/checkunusedvar.cpp
@@ -760,7 +760,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
             }
         }
 
-        else if (Token::Match(tok->tokAt(-2), "while|if") && Token::Match(tok->tokAt(1), "=") && tok->varId() && tok->varId() == tok->tokAt(2)->varId()) {
+        else if (Token::Match(tok->tokAt(-2), "while|if") && tok->strAt(1) == "=" && tok->varId() && tok->varId() == tok->tokAt(2)->varId()) {
             variables.use(tok->tokAt(2)->varId(), tok);
         }
         // assignment
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 815a6c98a..276483129 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -8654,7 +8654,7 @@ void Tokenizer::simplifyNamespaceStd()
     }
 
     for (Token* tok = list.front(); tok; tok = tok->next()) {
-        if (_settings->standards.cpp == Standards::CPP11 && Token::Match(tok, "std :: tr1 ::"))
+        if (_settings->standards.cpp == Standards::CPP11 && Token::simpleMatch(tok, "std :: tr1 ::"))
             Token::eraseTokens(tok, tok->tokAt(3));
 
         else if (Token::Match(tok, "using namespace std ;")) {
@@ -9230,12 +9230,12 @@ void Tokenizer::simplifyMathExpressions()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
 
-        if (Token::Match(tok,"exp ( 0 )") || Token::Match(tok,"cosh ( 0 )") || Token::Match(tok,"cos ( 0 )") || Token::Match(tok,"sqrt ( 1 )")) {
+        if (Token::Match(tok,"exp|cosh|cos ( 0 )") || Token::simpleMatch(tok,"sqrt ( 1 )")) {
             tok->deleteNext(3);
             tok->str("1");
         }
 
-        if (Token::Match(tok,"sinh ( 0 )") || Token::Match(tok,"sin ( 0 )") || Token::Match(tok,"sqrt ( 0 )") || Token::Match(tok,"ln ( 1 )")) {
+        if (Token::Match(tok,"sin|sinh|sqrt ( 0 )") || Token::simpleMatch(tok,"ln ( 1 )")) {
             tok->deleteNext(3);
             tok->str("0");
         }