diff --git a/.clang-tidy b/.clang-tidy
index e1bae2cd255..96c8908f0c0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -45,7 +45,6 @@ Checks: >
         -modernize-replace-auto-ptr,
         -modernize-return-braced-init-list,
         -modernize-use-auto,
-        -modernize-use-equals-default,
         -modernize-use-trailing-return-type,
         -performance-avoid-endl,
         -performance-inefficient-string-concatenation,
@@ -57,7 +56,6 @@ Checks: >
         -readability-braces-around-statements,
         -readability-const-return-type,
         -readability-container-data-pointer,
-        -readability-container-size-empty,
         -readability-convert-member-functions-to-static,
         -readability-function-cognitive-complexity,
         -readability-function-size,
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 902417375a8..10cbf319d3d 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -85,6 +85,8 @@ jobs:
           sudo apt-get update
           sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
 
+      # TODO: move latest compiler to separate step
+      # TODO: bail out on warnings with latest GCC
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
         if: matrix.os == 'ubuntu-22.04'
@@ -93,9 +95,9 @@ jobs:
           platform: x64
 
       - name: Select compiler
+        if: matrix.os == 'ubuntu-22.04'
         run: |
           echo "CXX=g++-13" >> $GITHUB_ENV
-        if: matrix.os == 'ubuntu-22.04'
 
       # coreutils contains "nproc"
       - name: Install missing software on macos
@@ -460,9 +462,11 @@ jobs:
 
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings --check-level=exhaustive"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings --check-level=exhaustive"
           ec=0
           
+          # TODO: add --check-config          
+         
           # early exit
           if [ $ec -eq 1 ]; then
             exit $ec
diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
index 4da98719ded..98df86f8558 100644
--- a/.github/workflows/CI-windows.yml
+++ b/.github/workflows/CI-windows.yml
@@ -13,6 +13,8 @@ defaults:
   run:
     shell: cmd
 
+# TODO: choose/add a step to bail out on compiler warnings (maybe even the release build)
+
 jobs:
 
   build_qt:
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
index fe7c5a95a77..c29ecde8a4a 100644
--- a/.github/workflows/asan.yml
+++ b/.github/workflows/asan.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
index 6114817c194..876e1976141 100644
--- a/.github/workflows/tsan.yml
+++ b/.github/workflows/tsan.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
index 3076801002e..2a422710b74 100644
--- a/.github/workflows/ubsan.yml
+++ b/.github/workflows/ubsan.yml
@@ -78,7 +78,7 @@ jobs:
       # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/Makefile b/Makefile
index 946755da0cb..d1256debd8e 100644
--- a/Makefile
+++ b/Makefile
@@ -455,7 +455,7 @@ validateRules:
 
 ###### Build
 
-$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/path.h lib/platform.h lib/suppressions.h lib/utils.h
+$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/path.h lib/platform.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
 
 $(libcppdir)/astutils.o: lib/astutils.cpp lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/errortypes.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
@@ -545,7 +545,7 @@ $(libcppdir)/clangimport.o: lib/clangimport.cpp lib/clangimport.h lib/config.h l
 $(libcppdir)/color.o: lib/color.cpp lib/color.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/color.cpp
 
-$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h
+$(libcppdir)/cppcheck.o: lib/cppcheck.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkunusedfunctions.h lib/clangimport.h lib/color.h lib/config.h lib/cppcheck.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/version.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/cppcheck.cpp
 
 $(libcppdir)/ctu.o: lib/ctu.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
@@ -563,7 +563,7 @@ $(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/analyzer.h lib/astut
 $(libcppdir)/fwdanalysis.o: lib/fwdanalysis.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/library.h lib/mathlib.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/fwdanalysis.cpp
 
-$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/importproject.o: lib/importproject.cpp externals/picojson/picojson.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/importproject.cpp
 
 $(libcppdir)/infer.o: lib/infer.cpp lib/calculate.h lib/config.h lib/errortypes.h lib/infer.h lib/mathlib.h lib/valueptr.h lib/vfvalue.h
@@ -599,7 +599,7 @@ $(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/calculate
 $(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/reverseanalyzer.cpp
 
-$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/timer.h lib/utils.h lib/vfvalue.h
+$(libcppdir)/settings.o: lib/settings.cpp externals/picojson/picojson.h lib/config.h lib/errortypes.h lib/importproject.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/timer.h lib/utils.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/settings.cpp
 
 $(libcppdir)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
@@ -629,7 +629,7 @@ $(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/
 $(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
 
-$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
+$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
 
 $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
@@ -641,10 +641,10 @@ cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecu
 cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h cli/cppcheckexecutorsig.h cli/executor.h cli/filelister.h cli/processexecutor.h cli/singleexecutor.h cli/threadexecutor.h lib/analyzerinfo.h lib/check.h lib/checkunusedfunctions.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
 
-cli/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h lib/utils.h
+cli/cppcheckexecutorseh.o: cli/cppcheckexecutorseh.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorseh.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorseh.cpp
 
-cli/cppcheckexecutorsig.o: cli/cppcheckexecutorsig.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorsig.h cli/stacktrace.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h
+cli/cppcheckexecutorsig.o: cli/cppcheckexecutorsig.cpp cli/cppcheckexecutor.h cli/cppcheckexecutorsig.h cli/stacktrace.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutorsig.cpp
 
 cli/executor.o: cli/executor.cpp cli/executor.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
@@ -653,7 +653,7 @@ cli/executor.o: cli/executor.cpp cli/executor.h lib/color.h lib/config.h lib/err
 cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/path.h lib/pathmatch.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/filelister.cpp
 
-cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/suppressions.h
+cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
 
 cli/processexecutor.o: cli/processexecutor.cpp cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h lib/analyzerinfo.h lib/check.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
@@ -716,7 +716,7 @@ test/testclangimport.o: test/testclangimport.cpp lib/check.h lib/clangimport.h l
 test/testclass.o: test/testclass.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkclass.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testclass.cpp
 
-test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h
+test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h cli/cppcheckexecutor.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcmdlineparser.cpp
 
 test/testcolor.o: test/testcolor.cpp lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h test/fixture.h
diff --git a/addons/test/misra/misra-test.c b/addons/test/misra/misra-test.c
index 2fd30c7e707..d4e7f39ad6c 100644
--- a/addons/test/misra/misra-test.c
+++ b/addons/test/misra/misra-test.c
@@ -645,11 +645,11 @@ static void misra_10_1_ternary(void)
 
     a = ui16 << ui16; // 10.6
     a = ui16 << (get_bool(42) ? ui16 : ui16);
-    a = ui16 << (get_bool(42) ? ui16 : (get_bool(34) ? ui16 : ui16)); // 10.4
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : ui16); // 10.4
-    a = ui16 << (get_bool(42) ? i16 : (get_bool(34) ? ui16 : ui16)); // 10.1
+    a = ui16 << (get_bool(42) ? ui16 : (get_bool(34) ? ui16 : ui16));
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : ui16);
+    a = ui16 << (get_bool(42) ? i16 : (get_bool(34) ? ui16 : ui16)); // 10.1 10.4
     a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : i16) : ui16); // 10.1 10.4
-    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : i16); // 10.1
+    a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui16) : i16); // 10.1 10.4
     a = ui16 << (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8); // 10.4
     a = ui16 << (get_bool(42) ? (get_bool(34) ? i16 : ui8) : ui8); // 10.1 10.4
     a = (get_bool(42) ? (get_bool(34) ? ui16 : ui8) : ui8) << ui16; // 10.4
@@ -1171,7 +1171,7 @@ static void misra_14_2_fn1(bool b) {
     g += 2;
     i2 ^= 2; // 14.2
     if (i2 == 2) {
-      g += g_arr[i2];
+      g += g_arr[i2]; // cppcheck-suppress legacyUninitvar
     }
     misra_14_2_init_value(&i2); // TODO: Fix false negative in function call
   }
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 105ee469b56..53dc335e463 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -2176,7 +2176,7 @@
     <noreturn>false</noreturn>
     <returnValue type="HRESULT"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
@@ -3432,7 +3432,7 @@ HFONT CreateFont(
     <arg nr="9" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="10" direction="in">
+    <arg nr="10">
       <not-uninit/>
     </arg>
     <arg nr="11" direction="in">
@@ -3487,7 +3487,7 @@ HFONT CreateFont(
     <arg nr="10" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="11" direction="in">
+    <arg nr="11">
       <not-uninit/>
     </arg>
     <arg nr="12" direction="in">
@@ -3501,7 +3501,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <returnValue type="BOOL"/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
       <not-uninit/>
     </arg>
@@ -4726,7 +4726,7 @@ HFONT CreateFont(
     <returnValue type="HMODULE"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <strz/>
     </arg>
@@ -4806,7 +4806,7 @@ HFONT CreateFont(
   <function name="FreeLibraryAndExitThread">
     <noreturn>true</noreturn>
     <returnValue type="VOID"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -4821,7 +4821,7 @@ HFONT CreateFont(
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="DWORD"/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
       <not-bool/>
     </arg>
@@ -5646,7 +5646,7 @@ HFONT CreateFont(
     <returnValue type="int"/>
     <leak-ignore/>
     <!-- The function does nothing (useful) if arg1 is nullptr or arg2 is nullptr or arg3 is 0 -->
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-null/>
     </arg>
     <arg nr="2" direction="out">
@@ -6791,7 +6791,7 @@ HFONT CreateFont(
     <returnValue type="HWND"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1" direction="in">
+    <arg nr="1">
       <not-uninit/>
     </arg>
     <arg nr="2" direction="in">
diff --git a/clang-tidy.md b/clang-tidy.md
index 2311d2d3a97..b85031ac25c 100644
--- a/clang-tidy.md
+++ b/clang-tidy.md
@@ -63,7 +63,6 @@ This does not appear to be useful as it is reported on very common code.
 
 It was decided not to apply these.
 
-`modernize-use-equals-default`<br/>
 `modernize-loop-convert`<br/>
 
 These might change the behavior of code which might not be intended (need to file an upstream issue)
@@ -129,7 +128,6 @@ Also reports a false positive about templates which deduce the array length: htt
 
 We run this separately via `clang-include-cleaner` in the `iwyu.yml` workflow as the findings of the include checkers still need to be reviewed manually before applying them. 
 
-`readability-container-size-empty`<br/>
 `bugprone-branch-clone`<br/>
 `readability-const-return-type`<br/>
 `modernize-return-braced-init-list`<br/>
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 92b5c6a0a78..e2a575533cc 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -507,10 +507,17 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                     printError("argument to '-j' is not valid - " +  err + ".");
                     return false;
                 }
-                if (tmp > 10000) {
-                    // This limit is here just to catch typos. If someone has
-                    // need for more jobs, this value should be increased.
-                    printError("argument for '-j' is allowed to be 10000 at max.");
+                if (tmp == 0) {
+                    // TODO: implement get CPU logical core count and use that.
+                    // Usually, -j 0 would mean "use all available cores," but
+                    // if we get a 0, we just stall and don't do any work.
+                    printError("argument for '-j' must be greater than 0.");
+                    return false;
+                }
+                if (tmp > 1024) {
+                    // Almost nobody has 1024 logical cores, but somebody out
+                    // there does.
+                    printError("argument for '-j' is allowed to be 1024 at max.");
                     return false;
                 }
                 mSettings.jobs = tmp;
@@ -892,7 +899,6 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 }
             }
 
-            // TODO: deprecate "--template <template>"
             // Output formatter
             else if (std::strcmp(argv[i], "--template") == 0 ||
                      std::strncmp(argv[i], "--template=", 11) == 0) {
@@ -900,6 +906,7 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 if (argv[i][10] == '=')
                     mSettings.templateFormat = argv[i] + 11;
                 else if ((i+1) < argc && argv[i+1][0] != '-') {
+                    printMessage("'--template <template>' is deprecated and will be removed in 2.13 - please use '--template=<template>' instead");
                     ++i;
                     mSettings.templateFormat = argv[i];
                 } else {
@@ -928,13 +935,13 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                 }
             }
 
-            // TODO: deprecate "--template-location <template>"
             else if (std::strcmp(argv[i], "--template-location") == 0 ||
                      std::strncmp(argv[i], "--template-location=", 20) == 0) {
                 // "--template-location format"
                 if (argv[i][19] == '=')
                     mSettings.templateLocation = argv[i] + 20;
                 else if ((i+1) < argc && argv[i+1][0] != '-') {
+                    printMessage("'--template-location <template>' is deprecated and will be removed in 2.13 - please use '--template-location=<template>' instead");
                     ++i;
                     mSettings.templateLocation = argv[i];
                 } else {
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index eabf0582022..540619939e2 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -261,11 +261,11 @@ bool CppCheckExecutor::reportSuppressions(const Settings &settings, bool unusedF
     bool err = false;
     if (settings.useSingleJob()) {
         for (std::map<std::string, std::size_t>::const_iterator i = files.cbegin(); i != files.cend(); ++i) {
-            err |= errorLogger.reportUnmatchedSuppressions(
-                settings.nomsg.getUnmatchedLocalSuppressions(i->first, unusedFunctionCheckEnabled));
+            err |= Suppressions::reportUnmatchedSuppressions(
+                settings.nomsg.getUnmatchedLocalSuppressions(i->first, unusedFunctionCheckEnabled), errorLogger);
         }
     }
-    err |= errorLogger.reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled));
+    err |= Suppressions::reportUnmatchedSuppressions(settings.nomsg.getUnmatchedGlobalSuppressions(unusedFunctionCheckEnabled), errorLogger);
     return err;
 }
 
diff --git a/cli/cppcheckexecutor.h b/cli/cppcheckexecutor.h
index 23e845e0e6f..e5577396d75 100644
--- a/cli/cppcheckexecutor.h
+++ b/cli/cppcheckexecutor.h
@@ -43,6 +43,8 @@ class Settings;
  */
 class CppCheckExecutor : public ErrorLogger {
 public:
+    friend class TestSuppressions;
+
     /**
      * Constructor
      */
@@ -101,8 +103,6 @@ class CppCheckExecutor : public ErrorLogger {
      */
     static bool executeCommand(std::string exe, std::vector<std::string> args, std::string redirect, std::string &output_);
 
-    static bool reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::map<std::string, std::size_t> &files, ErrorLogger& errorLogger);
-
 protected:
 
     /**
@@ -124,6 +124,8 @@ class CppCheckExecutor : public ErrorLogger {
 
 private:
 
+    static bool reportSuppressions(const Settings &settings, bool unusedFunctionCheckEnabled, const std::map<std::string, std::size_t> &files, ErrorLogger& errorLogger);
+
     /**
      * Wrapper around check_internal
      *   - installs optional platform dependent signal handling
diff --git a/cli/cppcheckexecutorsig.cpp b/cli/cppcheckexecutorsig.cpp
index e8d447682eb..c5347d8e5ac 100644
--- a/cli/cppcheckexecutorsig.cpp
+++ b/cli/cppcheckexecutorsig.cpp
@@ -101,6 +101,7 @@ static const Signalmap_t listofsignals = {
  * but when ending up here something went terribly wrong anyway.
  * And all which is left is just printing some information and terminate.
  */
+// cppcheck-suppress constParameterCallback
 static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
 {
     int type = -1;
@@ -119,7 +120,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
 
     const Signalmap_t::const_iterator it=listofsignals.find(signo);
     const char * const signame = (it==listofsignals.end()) ? "unknown" : it->second.c_str();
+#ifdef USE_UNIX_BACKTRACE_SUPPORT
     bool lowMem=false; // was low-memory condition detected? Be careful then! Avoid allocating much more memory then.
+#endif
     bool unexpectedSignal=true; // unexpected indicates program failure
     bool terminate=true; // exit process/thread
     const bool isAddressOnStack = IsAddressOnStack(info->si_addr);
@@ -135,7 +138,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
             " - out of memory or assertion?\n",
 #endif
             output);
+#ifdef USE_UNIX_BACKTRACE_SUPPORT
         lowMem=true;     // educated guess
+#endif
         break;
     case SIGBUS:
         fputs("Internal error: cppcheck received signal ", output);
@@ -296,7 +301,7 @@ int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(Cpp
 {
     // determine stack vs. heap
     char stackVariable;
-    char *heapVariable=(char*)malloc(1);
+    char *heapVariable=static_cast<char*>(malloc(1));
     bStackBelowHeap = &stackVariable < heapVariable;
     free(heapVariable);
 
diff --git a/cli/executor.cpp b/cli/executor.cpp
index 489d9f8951b..c7955d71704 100644
--- a/cli/executor.cpp
+++ b/cli/executor.cpp
@@ -31,9 +31,6 @@ Executor::Executor(const std::map<std::string, std::size_t> &files, const Settin
     : mFiles(files), mSettings(settings), mSuppressions(suppressions), mErrorLogger(errorLogger)
 {}
 
-Executor::~Executor()
-{}
-
 bool Executor::hasToLog(const ErrorMessage &msg)
 {
     if (!mSuppressions.isSuppressed(msg))
diff --git a/cli/executor.h b/cli/executor.h
index 1b7db25e71e..8c67c6cfedd 100644
--- a/cli/executor.h
+++ b/cli/executor.h
@@ -40,7 +40,7 @@ class Suppressions;
 class Executor {
 public:
     Executor(const std::map<std::string, std::size_t> &files, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
-    virtual ~Executor();
+    virtual ~Executor() = default;
 
     Executor(const Executor &) = delete;
     void operator=(const Executor &) = delete;
diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index c83b3756967..59a6028653b 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -192,29 +192,10 @@ static std::string addFiles2(std::map<std::string, std::size_t> &files,
             if (!dir)
                 return "";
 
-            dirent * dir_result;
-            // make sure we reserve enough space for the readdir_r() buffer;
-            // according to POSIX:
-            //   The storage pointed to by entry shall be large enough for a
-            //   dirent with an array of char d_name members containing at
-            //   least {NAME_MAX}+1 elements.
-            // on some platforms, d_name is not a static sized-array but
-            // a pointer to space usually reserved right after the dirent
-            // struct; the union here allows to reserve the space and to
-            // provide a pointer to the right type that can be passed where
-            // needed without casts
-            union {
-                dirent entry;
-                char buf[sizeof(*dir_result) + (sizeof(dir_result->d_name) > 1 ? 0 : NAME_MAX + 1)];
-            } dir_result_buffer;
-            // TODO: suppress instead?
-            (void)dir_result_buffer.buf; // do not trigger cppcheck itself on the "unused buf"
-            std::string new_path;
-            new_path.reserve(path.length() + 1 + sizeof(dir_result->d_name));// prealloc some memory to avoid constant new/deletes in loop
-            new_path += path;
+            std::string new_path = path;
             new_path += '/';
 
-            while ((SUPPRESS_DEPRECATED_WARNING(readdir_r(dir, &dir_result_buffer.entry, &dir_result)) == 0) && (dir_result != nullptr)) {
+            while (const struct dirent* dir_result = readdir(dir)) {
                 if ((std::strcmp(dir_result->d_name, ".") == 0) ||
                     (std::strcmp(dir_result->d_name, "..") == 0))
                     continue;
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
index be9c61d1548..566e503eb32 100644
--- a/cli/processexecutor.cpp
+++ b/cli/processexecutor.cpp
@@ -67,9 +67,6 @@ ProcessExecutor::ProcessExecutor(const std::map<std::string, std::size_t> &files
     assert(mSettings.jobs > 1);
 }
 
-ProcessExecutor::~ProcessExecutor()
-{}
-
 class PipeWriter : public ErrorLogger {
 public:
     enum PipeSignal {REPORT_OUT='1',REPORT_ERROR='2', CHILD_END='5'};
@@ -90,32 +87,35 @@ class PipeWriter : public ErrorLogger {
 
 private:
     // TODO: how to log file name in error?
-    void writeToPipe(PipeSignal type, const std::string &data) const
+    void writeToPipeInternal(PipeSignal type, const void* data, std::size_t to_write) const
     {
-        unsigned int len = static_cast<unsigned int>(data.length() + 1);
-        char *out = new char[len + 1 + sizeof(len)];
-        out[0] = static_cast<char>(type);
-        std::memcpy(&(out[1]), &len, sizeof(len));
-        std::memcpy(&(out[1+sizeof(len)]), data.c_str(), len);
-
-        std::size_t bytes_to_write = len + 1 + sizeof(len);
-        ssize_t bytes_written = write(mWpipe, out, len + 1 + sizeof(len));
+        const ssize_t bytes_written = write(mWpipe, data, to_write);
         if (bytes_written <= 0) {
             const int err = errno;
-            delete[] out;
-            out = nullptr;
-            std::cerr << "#### ThreadExecutor::writeToPipe() error for type " << type << ": " << std::strerror(err) << std::endl;
+            std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << type << ": " << std::strerror(err) << std::endl;
             std::exit(EXIT_FAILURE);
         }
         // TODO: write until everything is written
-        if (bytes_written != bytes_to_write) {
-            delete[] out;
-            out = nullptr;
-            std::cerr << "#### ThreadExecutor::writeToPipe() error for type " << type << ": insufficient data written (expected: " << bytes_to_write << " / got: " << bytes_written << ")" << std::endl;
+        if (bytes_written != to_write) {
+            std::cerr << "#### ThreadExecutor::writeToPipeInternal() error for type " << type << ": insufficient data written (expected: " << to_write << " / got: " << bytes_written << ")" << std::endl;
             std::exit(EXIT_FAILURE);
         }
+    }
+
+    void writeToPipe(PipeSignal type, const std::string &data) const
+    {
+        {
+            const char t = static_cast<char>(type);
+            writeToPipeInternal(type, &t, 1);
+        }
+
+        const unsigned int len = static_cast<unsigned int>(data.length() + 1);
+        {
+            static constexpr std::size_t l_size = sizeof(unsigned int);
+            writeToPipeInternal(type, &len, l_size);
+        }
 
-        delete[] out;
+        writeToPipeInternal(type, data.c_str(), len);
     }
 
     const int mWpipe;
@@ -164,8 +164,8 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
 
     // Don't rely on incoming data being null-terminated.
     // Allocate +1 element and null-terminate the buffer.
-    char *buf = new char[len + 1];
-    char *data_start = buf;
+    std::string buf(len + 1, '\0');
+    char *data_start = &buf[0];
     bytes_to_read = len;
     do {
         bytes_read = read(rpipe, data_start, bytes_to_read);
@@ -177,13 +177,14 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         bytes_to_read -= bytes_read;
         data_start += bytes_read;
     } while (bytes_to_read != 0);
-    buf[len] = 0;
+    buf[len] = '\0';
 
     bool res = true;
     if (type == PipeWriter::REPORT_OUT) {
         // the first character is the color
         const Color c = static_cast<Color>(buf[0]);
-        mErrorLogger.reportOut(buf + 1, c);
+        // TODO: avoid string copy
+        mErrorLogger.reportOut(buf.substr(1), c);
     } else if (type == PipeWriter::REPORT_ERROR) {
         ErrorMessage msg;
         try {
@@ -200,7 +201,6 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str
         res = false;
     }
 
-    delete[] buf;
     return res;
 }
 
diff --git a/cli/processexecutor.h b/cli/processexecutor.h
index 4b51d596acc..580c344cfae 100644
--- a/cli/processexecutor.h
+++ b/cli/processexecutor.h
@@ -40,7 +40,6 @@ class ProcessExecutor : public Executor {
 public:
     ProcessExecutor(const std::map<std::string, std::size_t> &files, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
     ProcessExecutor(const ProcessExecutor &) = delete;
-    ~ProcessExecutor() override;
     void operator=(const ProcessExecutor &) = delete;
 
     unsigned int check() override;
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
index c3fea886b24..c52c984d996 100644
--- a/cli/singleexecutor.cpp
+++ b/cli/singleexecutor.cpp
@@ -37,9 +37,6 @@ SingleExecutor::SingleExecutor(CppCheck &cppcheck, const std::map<std::string, s
     assert(mSettings.jobs == 1);
 }
 
-SingleExecutor::~SingleExecutor()
-{}
-
 // TODO: markup handling is not performed with multiple jobs
 unsigned int SingleExecutor::check()
 {
diff --git a/cli/singleexecutor.h b/cli/singleexecutor.h
index 4ca53768b43..7dc20a98490 100644
--- a/cli/singleexecutor.h
+++ b/cli/singleexecutor.h
@@ -35,7 +35,6 @@ class SingleExecutor : public Executor
 public:
     SingleExecutor(CppCheck &cppcheck, const std::map<std::string, std::size_t> &files, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
     SingleExecutor(const SingleExecutor &) = delete;
-    ~SingleExecutor() override;
     void operator=(const SingleExecutor &) = delete;
 
     unsigned int check() override;
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
index a6a9e671bd0..96f35ac4015 100644
--- a/cli/threadexecutor.cpp
+++ b/cli/threadexecutor.cpp
@@ -46,9 +46,6 @@ ThreadExecutor::ThreadExecutor(const std::map<std::string, std::size_t> &files,
     assert(mSettings.jobs > 1);
 }
 
-ThreadExecutor::~ThreadExecutor()
-{}
-
 class SyncLogForwarder : public ErrorLogger
 {
 public:
diff --git a/cli/threadexecutor.h b/cli/threadexecutor.h
index 62ad8e0a860..8ebae323b5b 100644
--- a/cli/threadexecutor.h
+++ b/cli/threadexecutor.h
@@ -40,7 +40,6 @@ class ThreadExecutor : public Executor {
 public:
     ThreadExecutor(const std::map<std::string, std::size_t> &files, const Settings &settings, Suppressions &suppressions, ErrorLogger &errorLogger);
     ThreadExecutor(const ThreadExecutor &) = delete;
-    ~ThreadExecutor() override;
     void operator=(const ThreadExecutor &) = delete;
 
     unsigned int check() override;
diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index e7d0a3bf787..4c5ad9af858 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -95,8 +95,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    add_compile_options_safe(-Wno-suggest-override) # TODO: enable when warnings are fixed in in tinyxml2
    add_compile_options_safe(-Wno-suggest-destructor-override) # TODO: enable when warnings are fixed in in tinyxml2
    add_compile_options_safe(-Wno-extra-semi-stmt) # TODO: enable when warnings are fixed in in tinyxml2
-   add_compile_options_safe(-Wno-implicitly-unsigned-literal)
-   add_compile_options_safe(-Wno-tautological-type-limit-compare)
    add_compile_options(-Wno-disabled-macro-expansion)
    add_compile_options_safe(-Wno-bitwise-instead-of-logical)
 
diff --git a/createrelease b/createrelease
index c99964be13d..0a98f850266 100755
--- a/createrelease
+++ b/createrelease
@@ -11,7 +11,7 @@
 #
 # self check, fix critical issues:
 # make clean && make CXXFLAGS=-O2 MATCHCOMPILER=yes -j4
-# ./cppcheck -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --xml cli gui/*.cpp lib 2> selfcheck.xml
+# ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --std=c++11 --library=cppcheck-lib --library=qt --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h --suppress=functionConst --suppress=functionStatic --xml cli gui/*.cpp lib 2> selfcheck.xml
 #
 # Update translations
 #   lupdate gui.pro
@@ -82,7 +82,7 @@
 # 2. scp -i ../.ssh/osuosl_id_rsa tools/donate-cpu-server.py danielmarjamaki@cppcheck1.osuosl.org:/var/daca@home/
 #
 # self check, fix stylistic issues:
-# ./cppcheck -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h cli gui/*.cpp lib
+# ./cppcheck -D__CPPCHECK__ -D__GNUC__ -DCHECK_INTERNAL -DHAVE_RULES --library=cppcheck-lib --enable=style --inconclusive --inline-suppr --suppress=bitwiseOnBoolean --suppress=shadowFunction --suppress=useStlAlgorithm --suppress=*:externals/picojson.h cli gui/*.cpp lib
 #
 # Set debug version (see 803eea912c9512c810a7e78d58bb927d89a6daa1)
 
diff --git a/gui/application.h b/gui/application.h
index ee624bf07cd..a5bbc31a323 100644
--- a/gui/application.h
+++ b/gui/application.h
@@ -42,7 +42,7 @@
  */
 class Application {
 public:
-    Application() {}
+    Application() = default;
     Application(QString name, QString path, QString params);
 
     /**
diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
index b45f30c6eb0..0a8fbf34631 100644
--- a/gui/checkthread.cpp
+++ b/gui/checkthread.cpp
@@ -86,14 +86,7 @@ static bool executeCommand(std::string exe, std::vector<std::string> args, std::
 CheckThread::CheckThread(ThreadResult &result) :
     mResult(result),
     mCppcheck(result, true, executeCommand)
-{
-    //ctor
-}
-
-CheckThread::~CheckThread()
-{
-    //dtor
-}
+{}
 
 void CheckThread::check(const Settings &settings)
 {
diff --git a/gui/checkthread.h b/gui/checkthread.h
index d74ec2514a9..65b6f782061 100644
--- a/gui/checkthread.h
+++ b/gui/checkthread.h
@@ -46,7 +46,6 @@ class CheckThread : public QThread {
     Q_OBJECT
 public:
     explicit CheckThread(ThreadResult &result);
-    ~CheckThread() override;
 
     /**
      * @brief Set settings for cppcheck
diff --git a/gui/codeeditstylecontrols.h b/gui/codeeditstylecontrols.h
index 7e87c7b5fc0..7285598ad73 100644
--- a/gui/codeeditstylecontrols.h
+++ b/gui/codeeditstylecontrols.h
@@ -35,7 +35,6 @@ class SelectColorButton : public QPushButton {
     Q_OBJECT
 public:
     explicit SelectColorButton(QWidget* parent);
-    ~SelectColorButton() override {}
 
     void setColor(const QColor& color);
     const QColor& getColor();
@@ -57,7 +56,6 @@ class SelectFontWeightCombo : public QComboBox {
     Q_OBJECT
 public:
     explicit SelectFontWeightCombo(QWidget* parent);
-    ~SelectFontWeightCombo() override {}
 
     void setWeight(const QFont::Weight& weight);
     const QFont::Weight& getWeight();
diff --git a/gui/codeeditstyledialog.h b/gui/codeeditstyledialog.h
index 9ef42907be4..c4aeffc99e8 100644
--- a/gui/codeeditstyledialog.h
+++ b/gui/codeeditstyledialog.h
@@ -42,7 +42,6 @@ class StyleEditDialog : public QDialog {
 public:
     explicit StyleEditDialog(const CodeEditorStyle& newStyle,
                              QWidget *parent = nullptr);
-    ~StyleEditDialog() override {}
 
     CodeEditorStyle getStyle();
 
diff --git a/gui/cppchecklibrarydata.cpp b/gui/cppchecklibrarydata.cpp
index 2e7761a6534..83fe76622f6 100644
--- a/gui/cppchecklibrarydata.cpp
+++ b/gui/cppchecklibrarydata.cpp
@@ -35,9 +35,6 @@
 const unsigned int CppcheckLibraryData::Function::Arg::ANY = ~0U;
 const unsigned int CppcheckLibraryData::Function::Arg::VARIADIC = ~1U;
 
-CppcheckLibraryData::CppcheckLibraryData()
-{}
-
 static std::string unhandledElement(const QXmlStreamReader &xmlReader)
 {
     throw std::runtime_error(QObject::tr("line %1: Unhandled element %2").arg(xmlReader.lineNumber()).arg(xmlReader.name().toString()).toStdString());
diff --git a/gui/cppchecklibrarydata.h b/gui/cppchecklibrarydata.h
index 252d66920ba..07fc2a81107 100644
--- a/gui/cppchecklibrarydata.h
+++ b/gui/cppchecklibrarydata.h
@@ -30,7 +30,7 @@ class QIODevice;
 
 class CppcheckLibraryData {
 public:
-    CppcheckLibraryData();
+    CppcheckLibraryData() = default;
 
     struct Container {
         QString id;
diff --git a/gui/csvreport.cpp b/gui/csvreport.cpp
index 36da50bbde5..740651cf06f 100644
--- a/gui/csvreport.cpp
+++ b/gui/csvreport.cpp
@@ -30,9 +30,6 @@ CsvReport::CsvReport(const QString &filename) :
     Report(filename)
 {}
 
-CsvReport::~CsvReport()
-{}
-
 bool CsvReport::create()
 {
     if (Report::create()) {
diff --git a/gui/csvreport.h b/gui/csvreport.h
index a2efdd93b0a..cfd918fe082 100644
--- a/gui/csvreport.h
+++ b/gui/csvreport.h
@@ -39,7 +39,6 @@ class ErrorItem;
 class CsvReport : public Report {
 public:
     explicit CsvReport(const QString &filename);
-    ~CsvReport() override;
 
     /**
      * @brief Create the report (file).
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 2840c48330d..fd5dc6dfff0 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -697,7 +697,7 @@ void MainWindow::analyzeFiles()
 
     QStringList selected = selectFilesToAnalyze(QFileDialog::ExistingFiles);
 
-    const QString file0 = (selected.size() ? selected[0].toLower() : QString());
+    const QString file0 = (!selected.empty() ? selected[0].toLower() : QString());
     if (file0.endsWith(".sln")
         || file0.endsWith(".vcxproj")
         || file0.endsWith(compile_commands_json)
diff --git a/gui/printablereport.cpp b/gui/printablereport.cpp
index 9bcfff55c34..d9272632f45 100644
--- a/gui/printablereport.cpp
+++ b/gui/printablereport.cpp
@@ -27,9 +27,6 @@ PrintableReport::PrintableReport() :
     Report(QString())
 {}
 
-PrintableReport::~PrintableReport()
-{}
-
 bool PrintableReport::create()
 {
     return true;
diff --git a/gui/printablereport.h b/gui/printablereport.h
index 29fa008bf61..693356a961d 100644
--- a/gui/printablereport.h
+++ b/gui/printablereport.h
@@ -36,7 +36,6 @@ class ErrorItem;
 class PrintableReport : public Report {
 public:
     PrintableReport();
-    ~PrintableReport() override;
 
     /**
      * @brief Create the report (file).
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index 61f995e6bf4..946437f9602 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -91,9 +91,6 @@ ResultsTree::ResultsTree(QWidget * parent) :
     connect(this, &ResultsTree::doubleClicked, this, &ResultsTree::quickStartApplication);
 }
 
-ResultsTree::~ResultsTree()
-{}
-
 void ResultsTree::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
@@ -815,7 +812,15 @@ void ResultsTree::startApplication(QStandardItem *target, int application)
         const QString cmdLine = QString("%1 %2").arg(program).arg(params);
 
         // this is reported as deprecated in Qt 5.15.2 but no longer in Qt 6
-        const bool success = SUPPRESS_DEPRECATED_WARNING(QProcess::startDetached(cmdLine));
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+        SUPPRESS_WARNING_CLANG_PUSH("-Wdeprecated")
+        SUPPRESS_WARNING_GCC_PUSH("-Wdeprecated-declarations")
+#endif
+        const bool success = QProcess::startDetached(cmdLine);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+        SUPPRESS_WARNING_GCC_POP
+            SUPPRESS_WARNING_CLANG_POP
+#endif
         if (!success) {
             QString text = tr("Could not start %1\n\nPlease check the application path and parameters are correct.").arg(program);
 
diff --git a/gui/resultstree.h b/gui/resultstree.h
index 5828c0e383b..8a8a79642b4 100644
--- a/gui/resultstree.h
+++ b/gui/resultstree.h
@@ -53,7 +53,7 @@ class ResultsTree : public QTreeView {
     Q_OBJECT
 public:
     explicit ResultsTree(QWidget * parent = nullptr);
-    ~ResultsTree() override;
+
     void initialize(QSettings *settings, ApplicationList *list, ThreadHandler *checkThreadHandler);
 
     /**
diff --git a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
index aadb090d1e7..015e8a60dec 100644
--- a/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
+++ b/gui/test/cppchecklibrarydata/testcppchecklibrarydata.cpp
@@ -620,7 +620,7 @@ void TestCppcheckLibraryData::validateAllCfg()
 {
     const QDir dir(QString(SRCDIR) + "/../../../cfg/");
     const QStringList files = dir.entryList(QStringList() << "*.cfg",QDir::Files);
-    QVERIFY(files.size() != 0);
+    QVERIFY(!files.empty());
     bool error = false;
     for (const QString& f : files) {
         loadCfgFile(dir.absolutePath() + "/" + f, fileLibraryData, result);
diff --git a/gui/test/projectfile/testprojectfile.cpp b/gui/test/projectfile/testprojectfile.cpp
index cbd98dc86ca..65531aa0fa3 100644
--- a/gui/test/projectfile/testprojectfile.cpp
+++ b/gui/test/projectfile/testprojectfile.cpp
@@ -40,8 +40,8 @@ const char Settings::SafeChecks::XmlExternalFunctions[] = "external-functions";
 const char Settings::SafeChecks::XmlInternalFunctions[] = "internal-functions";
 const char Settings::SafeChecks::XmlExternalVariables[] = "external-variables";
 Settings::Settings() : maxCtuDepth(10) {}
-cppcheck::Platform::Platform() {}
-ImportProject::ImportProject() {}
+cppcheck::Platform::Platform() = default;
+ImportProject::ImportProject() = default;
 bool ImportProject::sourceFileExists(const std::string & /*file*/) {
     return true;
 }
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
index 5e1aed89b78..52d683414a8 100644
--- a/gui/threadresult.cpp
+++ b/gui/threadresult.cpp
@@ -28,11 +28,6 @@
 #include <QFile>
 #include <QMutexLocker>
 
-ThreadResult::~ThreadResult()
-{
-    //dtor
-}
-
 void ThreadResult::reportOut(const std::string &outmsg, Color /*c*/)
 {
     emit log(QString::fromStdString(outmsg));
diff --git a/gui/threadresult.h b/gui/threadresult.h
index f08bb945230..4e32a1cbef2 100644
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@@ -46,7 +46,6 @@ class ThreadResult : public QObject, public ErrorLogger {
     Q_OBJECT
 public:
     ThreadResult() = default;
-    ~ThreadResult() override;
 
     /**
      * @brief Get next unprocessed file
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
index 6b14b6241fb..2e17148fd2a 100644
--- a/gui/translationhandler.cpp
+++ b/gui/translationhandler.cpp
@@ -62,9 +62,6 @@ TranslationHandler::TranslationHandler(QObject *parent) :
     addTranslation("Swedish", "cppcheck_sv");
 }
 
-TranslationHandler::~TranslationHandler()
-{}
-
 bool TranslationHandler::setLanguage(const QString &code)
 {
     bool failure = false;
diff --git a/gui/translationhandler.h b/gui/translationhandler.h
index e9ff8722058..cd298d6ebaf 100644
--- a/gui/translationhandler.h
+++ b/gui/translationhandler.h
@@ -63,7 +63,6 @@ class TranslationHandler : QObject {
     Q_OBJECT
 public:
     explicit TranslationHandler(QObject *parent = nullptr);
-    ~TranslationHandler() override;
 
     /**
      * @brief Get a list of available translations.
diff --git a/gui/txtreport.cpp b/gui/txtreport.cpp
index 1be3944341c..caa3833ef8d 100644
--- a/gui/txtreport.cpp
+++ b/gui/txtreport.cpp
@@ -29,9 +29,6 @@ TxtReport::TxtReport(const QString &filename) :
     Report(filename)
 {}
 
-TxtReport::~TxtReport()
-{}
-
 bool TxtReport::create()
 {
     if (Report::create()) {
diff --git a/gui/txtreport.h b/gui/txtreport.h
index 02395cc4484..d3e74f93d7c 100644
--- a/gui/txtreport.h
+++ b/gui/txtreport.h
@@ -40,7 +40,6 @@ class TxtReport : public Report {
 
 public:
     explicit TxtReport(const QString &filename);
-    ~TxtReport() override;
 
     /**
      * @brief Create the report (file).
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 741e6c2adfc..e4332578a95 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -56,16 +56,3 @@ endif()
 if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
     target_precompile_headers(cppcheck-core PRIVATE precompiled.h)
 endif()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # -Wfloat-equal is generated by picojson.h
-    if (NOT USE_MATCHCOMPILER_OPT STREQUAL "Off")
-        set_source_files_properties(mc_cppcheck.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(mc_importproject.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(mc_settings.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-    else()
-        set_source_files_properties(cppcheck.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(importproject.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-        set_source_files_properties(settings.cpp PROPERTIES COMPILE_FLAGS -Wno-float-equal)
-    endif()
-endif()
diff --git a/lib/analyzer.h b/lib/analyzer.h
index 3c65e0e68de..3ceab711b32 100644
--- a/lib/analyzer.h
+++ b/lib/analyzer.h
@@ -184,7 +184,7 @@ struct Analyzer {
     virtual bool invalid() const {
         return false;
     }
-    virtual ~Analyzer() {}
+    virtual ~Analyzer() = default;
     Analyzer(const Analyzer&) = default;
 protected:
     Analyzer() = default;
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index b1dc9900af7..78252680e11 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -259,6 +259,18 @@ bool astIsContainerOwned(const Token* tok) {
     return astIsContainer(tok) && !astIsContainerView(tok);
 }
 
+bool astIsContainerString(const Token* tok)
+{
+    if (!tok)
+        return false;
+    if (!tok->valueType())
+        return false;
+    const Library::Container* container = tok->valueType()->container;
+    if (!container)
+        return false;
+    return container->stdStringLike;
+}
+
 static const Token* getContainerFunction(const Token* tok)
 {
     if (!tok || !tok->valueType() || !tok->valueType()->container)
@@ -329,7 +341,7 @@ static bool match(const Token *tok, const std::string &rhs)
 {
     if (tok->str() == rhs)
         return true;
-    if (!tok->varId() && tok->hasKnownIntValue() && MathLib::toString(tok->values().front().intvalue) == rhs)
+    if (!tok->varId() && tok->hasKnownIntValue() && std::to_string(tok->values().front().intvalue) == rhs)
         return true;
     return false;
 }
@@ -726,7 +738,7 @@ std::vector<ValueType> getParentValueTypes(const Token* tok, const Settings* set
         const ValueType* vtCont = contTok->valueType();
         if (!vtCont->containerTypeToken)
             return {};
-        ValueType vtParent = ValueType::parseDecl(vtCont->containerTypeToken, *settings, true); // TODO: set isCpp
+        ValueType vtParent = ValueType::parseDecl(vtCont->containerTypeToken, *settings);
         return {std::move(vtParent)};
     }
     if (Token::Match(tok->astParent(), "return|(|{|%assign%") && parent) {
@@ -888,9 +900,16 @@ bool extractForLoopValues(const Token *forToken,
     if (!initExpr || !initExpr->isBinaryOp() || initExpr->str() != "=" || !Token::Match(initExpr->astOperand1(), "%var%"))
         return false;
     std::vector<MathLib::bigint> minInitValue = getMinValue(ValueFlow::makeIntegralInferModel(), initExpr->astOperand2()->values());
+    if (minInitValue.empty()) {
+        const ValueFlow::Value* v = initExpr->astOperand2()->getMinValue(true);
+        if (v)
+            minInitValue.push_back(v->intvalue);
+    }
+    if (minInitValue.empty())
+        return false;
     varid = initExpr->astOperand1()->varId();
     knownInitValue = initExpr->astOperand2()->hasKnownIntValue();
-    initValue = minInitValue.empty() ? 0 : minInitValue.front();
+    initValue = minInitValue.front();
     partialCond = Token::Match(condExpr, "%oror%|&&");
     visitAstNodes(condExpr, [varid, &condExpr](const Token *tok) {
         if (Token::Match(tok, "%oror%|&&"))
@@ -1445,6 +1464,19 @@ static bool astIsBoolLike(const Token* tok)
     return astIsBool(tok) || isUsedAsBool(tok);
 }
 
+bool isBooleanFuncArg(const Token* tok) {
+    if (tok->variable() && tok->variable()->valueType() && tok->variable()->valueType()->type == ValueType::BOOL) // skip trivial case: bool passed as bool
+        return false;
+    int argn{};
+    const Token* ftok = getTokenArgumentFunction(tok, argn);
+    if (!ftok)
+        return false;
+    std::vector<const Variable*> argvars = getArgumentVars(ftok, argn);
+    if (argvars.size() != 1)
+        return false;
+    return !argvars[0]->isReference() && argvars[0]->valueType() && argvars[0]->valueType()->type == ValueType::BOOL;
+}
+
 bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2, const Library& library, bool pure, bool followVar, ErrorPath* errors)
 {
     if (tok1 == nullptr && tok2 == nullptr)
@@ -3129,30 +3161,33 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Settings
     return ExprUsage::Inconclusive;
 }
 
-ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings)
+ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings, bool cpp)
 {
-    if (indirect > 0 && tok->astParent()) {
-        if (Token::Match(tok->astParent(), "%assign%") && astIsRHS(tok))
+    const Token* const parent = tok->astParent();
+    if (indirect > 0 && parent) {
+        if (Token::Match(parent, "%assign%") && astIsRHS(tok))
             return ExprUsage::NotUsed;
-        if (tok->astParent()->isConstOp())
+        if (parent->isConstOp())
             return ExprUsage::NotUsed;
-        if (tok->astParent()->isCast())
+        if (parent->isCast())
             return ExprUsage::NotUsed;
-        if (Token::simpleMatch(tok->astParent(), ":") && Token::simpleMatch(tok->astParent()->astParent(), "?"))
-            return getExprUsage(tok->astParent()->astParent(), indirect, settings);
+        if (Token::simpleMatch(parent, ":") && Token::simpleMatch(parent->astParent(), "?"))
+            return getExprUsage(parent->astParent(), indirect, settings, cpp);
     }
     if (indirect == 0) {
-        if (Token::Match(tok->astParent(), "%cop%|%assign%|++|--") && !Token::Match(tok->astParent(), "=|>>") &&
-            !tok->astParent()->isUnaryOp("&"))
+        if (Token::Match(parent, "%cop%|%assign%|++|--") && parent->str() != "=" &&
+            !parent->isUnaryOp("&") &&
+            !(astIsRHS(tok) && isLikelyStreamRead(cpp, parent)))
             return ExprUsage::Used;
-        if (Token::simpleMatch(tok->astParent(), "=") && astIsRHS(tok)) {
-            if (tok->astParent()->astOperand1() && tok->astParent()->astOperand1()->variable() && tok->astParent()->astOperand1()->variable()->isReference())
+        if (Token::simpleMatch(parent, "=") && astIsRHS(tok)) {
+            const Token* const lhs  = parent->astOperand1();
+            if (lhs && lhs->variable() && lhs->variable()->isReference() && lhs == lhs->variable()->nameToken())
                 return ExprUsage::NotUsed;
             return ExprUsage::Used;
         }
         // Function call or index
-        if (((Token::simpleMatch(tok->astParent(), "(") && !tok->astParent()->isCast()) || (Token::simpleMatch(tok->astParent(), "[") && tok->valueType())) &&
-            (astIsLHS(tok) || Token::simpleMatch(tok->astParent(), "( )")))
+        if (((Token::simpleMatch(parent, "(") && !parent->isCast()) || (Token::simpleMatch(parent, "[") && tok->valueType())) &&
+            (astIsLHS(tok) || Token::simpleMatch(parent, "( )")))
             return ExprUsage::Used;
     }
     return getFunctionUsage(tok, indirect, settings);
diff --git a/lib/astutils.h b/lib/astutils.h
index 04143bc7f57..0ef08ece023 100644
--- a/lib/astutils.h
+++ b/lib/astutils.h
@@ -149,6 +149,7 @@ bool astIsContainer(const Token *tok);
 
 bool astIsContainerView(const Token* tok);
 bool astIsContainerOwned(const Token* tok);
+bool astIsContainerString(const Token* tok);
 
 Library::Container::Action astContainerAction(const Token* tok, const Token** ftok = nullptr);
 Library::Container::Yield astContainerYield(const Token* tok, const Token** ftok = nullptr);
@@ -251,10 +252,15 @@ bool isStructuredBindingVariable(const Variable* var);
 const Token* isInLoopCondition(const Token* tok);
 
 /**
- * Is token used a boolean, that is to say cast to a bool, or used as a condition in a if/while/for
+ * Is token used as boolean, that is to say cast to a bool, or used as a condition in a if/while/for
  */
 CPPCHECKLIB bool isUsedAsBool(const Token * const tok);
 
+/**
+ * Is token passed to a function taking a bool argument
+ */
+CPPCHECKLIB bool isBooleanFuncArg(const Token* tok);
+
 /**
  * Are two conditions opposite
  * @param isNot  do you want to know if cond1 is !cond2 or if cond1 and cond2 are non-overlapping. true: cond1==!cond2  false: cond1==true => cond2==false
@@ -409,7 +415,7 @@ bool isConstVarExpression(const Token* tok, std::function<bool(const Token*)> sk
 
 enum class ExprUsage { None, NotUsed, PassedByReference, Used, Inconclusive };
 
-ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings);
+ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings, bool cpp);
 
 const Variable *getLHSVariable(const Token *tok);
 
diff --git a/lib/check.cpp b/lib/check.cpp
index bc67e683dfc..de7b3892c10 100644
--- a/lib/check.cpp
+++ b/lib/check.cpp
@@ -55,7 +55,7 @@ Check::Check(const std::string &aname)
         instances().insert(it, this);
 }
 
-void Check::reportError(const ErrorMessage &errmsg)
+void Check::writeToErrorList(const ErrorMessage &errmsg)
 {
     std::cout << errmsg.toXML() << std::endl;
 }
@@ -67,7 +67,7 @@ void Check::reportError(const std::list<const Token *> &callstack, Severity::Sev
     if (mErrorLogger)
         mErrorLogger->reportErr(errmsg);
     else
-        reportError(errmsg);
+        writeToErrorList(errmsg);
 }
 
 void Check::reportError(const ErrorPath &errorPath, Severity::SeverityType severity, const char id[], const std::string &msg, const CWE &cwe, Certainty certainty)
@@ -76,7 +76,7 @@ void Check::reportError(const ErrorPath &errorPath, Severity::SeverityType sever
     if (mErrorLogger)
         mErrorLogger->reportErr(errmsg);
     else
-        reportError(errmsg);
+        writeToErrorList(errmsg);
 }
 
 bool Check::wrongData(const Token *tok, const char *str)
diff --git a/lib/check.h b/lib/check.h
index 39e34781505..5421c64a71c 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -77,7 +77,7 @@ class CPPCHECKLIB Check {
     static std::list<Check *> &instances();
 
     /** run checks, the token list is not simplified */
-    virtual void runChecks(const Tokenizer *, const Settings *, ErrorLogger *) = 0;
+    virtual void runChecks(const Tokenizer &, ErrorLogger *) = 0;
 
     /** get error messages */
     virtual void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const = 0;
@@ -91,17 +91,17 @@ class CPPCHECKLIB Check {
     virtual std::string classInfo() const = 0;
 
     /**
-     * Write given error to errorlogger or to out stream in xml format.
+     * Write given error to stdout in xml format.
      * This is for for printout out the error list with --errorlist
      * @param errmsg Error message to write
      */
-    static void reportError(const ErrorMessage &errmsg);
+    static void writeToErrorList(const ErrorMessage &errmsg);
 
     /** Base class used for whole-program analysis */
     class CPPCHECKLIB FileInfo {
     public:
-        FileInfo() {}
-        virtual ~FileInfo() {}
+        FileInfo() = default;
+        virtual ~FileInfo() = default;
         virtual std::string toString() const {
             return std::string();
         }
diff --git a/lib/check64bit.h b/lib/check64bit.h
index 67f10c42e38..e79acbd8567 100644
--- a/lib/check64bit.h
+++ b/lib/check64bit.h
@@ -24,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 
 /// @addtogroup Checks
@@ -50,8 +50,8 @@ class CPPCHECKLIB Check64BitPortability : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        Check64BitPortability check64BitPortability(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        Check64BitPortability check64BitPortability(&tokenizer, tokenizer.getSettings(), errorLogger);
         check64BitPortability.pointerassignment();
     }
 
diff --git a/lib/checkassert.h b/lib/checkassert.h
index 78ce0905c4c..e2455a921ce 100644
--- a/lib/checkassert.h
+++ b/lib/checkassert.h
@@ -24,6 +24,7 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
@@ -31,7 +32,6 @@ class ErrorLogger;
 class Scope;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -48,8 +48,8 @@ class CPPCHECKLIB CheckAssert : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckAssert checkAssert(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckAssert checkAssert(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkAssert.assertWithSideEffects();
     }
 
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index ea70beba372..b02a0d0a6c3 100644
--- a/lib/checkautovariables.h
+++ b/lib/checkautovariables.h
@@ -25,13 +25,13 @@
 #include "check.h"
 #include "config.h"
 #include "errortypes.h"
+#include "tokenize.h"
 
 #include <string>
 #include <set>
 
 class Settings;
 class Token;
-class Tokenizer;
 class ErrorLogger;
 class Variable;
 
@@ -54,8 +54,8 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckAutoVariables checkAutoVariables(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckAutoVariables checkAutoVariables(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkAutoVariables.assignFunctionArg();
         checkAutoVariables.checkVarLifetime();
         checkAutoVariables.autoVariables();
diff --git a/lib/checkbool.h b/lib/checkbool.h
index d6213a58dbb..94d1714a97e 100644
--- a/lib/checkbool.h
+++ b/lib/checkbool.h
@@ -24,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -48,8 +48,8 @@ class CPPCHECKLIB CheckBool : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckBool checkBool(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckBool checkBool(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkBool.checkComparisonOfBoolExpressionWithInt();
diff --git a/lib/checkboost.h b/lib/checkboost.h
index a232ad22cf1..1ea25b28501 100644
--- a/lib/checkboost.h
+++ b/lib/checkboost.h
@@ -47,11 +47,11 @@ class CPPCHECKLIB CheckBoost : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!tokenizer->isCPP())
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (!tokenizer.isCPP())
             return;
 
-        CheckBoost checkBoost(tokenizer, settings, errorLogger);
+        CheckBoost checkBoost(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkBoost.checkBoostForeachModification();
     }
 
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index d0dbe95dacf..cf5ec86fd71 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -119,7 +119,7 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
                 i_d_x_f_found = true;
                 parameterLength = 1;
                 if (inputArgNr < parameters.size() && parameters[inputArgNr]->hasKnownIntValue())
-                    parameterLength = MathLib::toString(parameters[inputArgNr]->getKnownIntValue()).length();
+                    parameterLength = std::to_string(parameters[inputArgNr]->getKnownIntValue()).length();
 
                 handleNextParameter = true;
                 break;
@@ -362,7 +362,7 @@ void CheckBufferOverrun::arrayIndex()
 static std::string stringifyIndexes(const std::string& array, const std::vector<ValueFlow::Value>& indexValues)
 {
     if (indexValues.size() == 1)
-        return MathLib::toString(indexValues[0].intvalue);
+        return std::to_string(indexValues[0].intvalue);
 
     std::ostringstream ret;
     ret << array;
@@ -383,7 +383,7 @@ static std::string arrayIndexMessage(const Token* tok,
                                      const Token* condition)
 {
     auto add_dim = [](const std::string &s, const Dimension &dim) {
-        return s + "[" + MathLib::toString(dim.num) + "]";
+        return s + "[" + std::to_string(dim.num) + "]";
     };
     const std::string array = std::accumulate(dimensions.cbegin(), dimensions.cend(), tok->astOperand1()->expressionString(), add_dim);
 
@@ -528,7 +528,7 @@ void CheckBufferOverrun::pointerArithmeticError(const Token *tok, const Token *i
 
     std::string errmsg;
     if (indexValue->condition)
-        errmsg = "Undefined behaviour, when '" + indexToken->expressionString() + "' is " + MathLib::toString(indexValue->intvalue) + " the pointer arithmetic '" + tok->expressionString() + "' is out of bounds.";
+        errmsg = "Undefined behaviour, when '" + indexToken->expressionString() + "' is " + std::to_string(indexValue->intvalue) + " the pointer arithmetic '" + tok->expressionString() + "' is out of bounds.";
     else
         errmsg = "Undefined behaviour, pointer arithmetic '" + tok->expressionString() + "' is out of bounds.";
 
@@ -992,13 +992,13 @@ bool CheckBufferOverrun::analyseWholeProgram1(const std::map<std::string, std::l
     if (type == 1) {
         errorId = "ctuArrayIndex";
         if (unsafeUsage.value > 0)
-            errmsg = "Array index out of bounds; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue) + " and it is accessed at offset " + MathLib::toString(unsafeUsage.value) + ".";
+            errmsg = "Array index out of bounds; '" + unsafeUsage.myArgumentName + "' buffer size is " + std::to_string(functionCall->callArgValue) + " and it is accessed at offset " + std::to_string(unsafeUsage.value) + ".";
         else
-            errmsg = "Array index out of bounds; buffer '" + unsafeUsage.myArgumentName + "' is accessed at offset " + MathLib::toString(unsafeUsage.value) + ".";
+            errmsg = "Array index out of bounds; buffer '" + unsafeUsage.myArgumentName + "' is accessed at offset " + std::to_string(unsafeUsage.value) + ".";
         cwe = (unsafeUsage.value > 0) ? CWE_BUFFER_OVERRUN : CWE_BUFFER_UNDERRUN;
     } else {
         errorId = "ctuPointerArith";
-        errmsg = "Pointer arithmetic overflow; '" + unsafeUsage.myArgumentName + "' buffer size is " + MathLib::toString(functionCall->callArgValue);
+        errmsg = "Pointer arithmetic overflow; '" + unsafeUsage.myArgumentName + "' buffer size is " + std::to_string(functionCall->callArgValue);
         cwe = CWE_POINTER_ARITHMETIC_OVERFLOW;
     }
 
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
index d402330dd56..16e3a7532da 100644
--- a/lib/checkbufferoverrun.h
+++ b/lib/checkbufferoverrun.h
@@ -28,6 +28,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "symboldatabase.h"
+#include "tokenize.h"
 #include "vfvalue.h"
 
 #include <list>
@@ -42,7 +43,6 @@ namespace tinyxml2 {
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -66,8 +66,8 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
     CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckBufferOverrun checkBufferOverrun(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckBufferOverrun checkBufferOverrun(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkBufferOverrun.arrayIndex();
         checkBufferOverrun.pointerArithmetic();
         checkBufferOverrun.bufferOverflow();
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
index 662a6707619..29a94f024bd 100644
--- a/lib/checkclass.cpp
+++ b/lib/checkclass.cpp
@@ -2845,7 +2845,7 @@ void CheckClass::virtualFunctionCallInConstructorError(
     }
 
     reportError(errorPath, Severity::style, "virtualCallInConstructor",
-                "Virtual function '" + funcname + "' is called from " + scopeFunctionTypeName + " '" + constructorName + "' at line " + MathLib::toString(lineNumber) + ". Dynamic binding is not used.", CWE(0U), Certainty::normal);
+                "Virtual function '" + funcname + "' is called from " + scopeFunctionTypeName + " '" + constructorName + "' at line " + std::to_string(lineNumber) + ". Dynamic binding is not used.", CWE(0U), Certainty::normal);
 }
 
 void CheckClass::pureVirtualFunctionCallInConstructorError(
@@ -3228,7 +3228,7 @@ void CheckClass::checkThisUseAfterFree()
         for (const Variable &var : classScope->varlist) {
             // Find possible "self pointer".. pointer/smartpointer member variable of "self" type.
             if (var.valueType() && var.valueType()->smartPointerType != classScope->definedType && var.valueType()->typeScope != classScope) {
-                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), *mSettings, true); // this is only called for C++
+                const ValueType valueType = ValueType::parseDecl(var.typeStartToken(), *mSettings);
                 if (valueType.smartPointerType != classScope->definedType)
                     continue;
             }
diff --git a/lib/checkclass.h b/lib/checkclass.h
index ffb94d3a247..3134ebf152f 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -59,11 +59,11 @@ class CPPCHECKLIB CheckClass : public Check {
     CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger);
 
     /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (tokenizer.isC())
             return;
 
-        CheckClass checkClass(tokenizer, settings, errorLogger);
+        CheckClass checkClass(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // can't be a simplified check .. the 'sizeof' is used.
         checkClass.checkMemset();
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index be1283232ea..8219d04b1ec 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -1039,7 +1039,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
             return false;
         op = invertOperatorForOperandSwap(comp->str());
         if (op1->enumerator() && op1->enumerator()->value_known)
-            value = MathLib::toString(op1->enumerator()->value);
+            value = std::to_string(op1->enumerator()->value);
         else
             value = op1->str();
         expr = op2;
@@ -1048,7 +1048,7 @@ static bool parseComparison(const Token *comp, bool &not1, std::string &op, std:
             return false;
         op = comp->str();
         if (op2->enumerator() && op2->enumerator()->value_known)
-            value = MathLib::toString(op2->enumerator()->value);
+            value = std::to_string(op2->enumerator()->value);
         else
             value = op2->str();
         expr = op1;
@@ -1466,7 +1466,7 @@ void CheckCondition::alwaysTrueFalse()
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (Token::simpleMatch(tok, "<") && tok->link()) // don't write false positives when templates are used
                 continue;
-            if (!tok->hasKnownIntValue())
+            if (!tok->hasKnownBoolValue())
                 continue;
             if (Token::Match(tok->previous(), "%name% (") && tok->previous()->function()) {
                 const Function* f = tok->previous()->function();
@@ -1490,6 +1490,8 @@ void CheckCondition::alwaysTrueFalse()
                 else if (parent->str() == ";" && parent->astParent() && parent->astParent()->astParent() &&
                          Token::simpleMatch(parent->astParent()->astParent()->previous(), "for ("))
                     condition = parent->astParent()->astParent()->previous();
+                else if (isBooleanFuncArg(tok))
+                    condition = tok;
                 else
                     continue;
             }
@@ -1580,14 +1582,17 @@ void CheckCondition::alwaysTrueFalse()
             if (hasSizeof)
                 continue;
 
-            alwaysTrueFalseError(tok, condition, &tok->values().front());
+            auto it = std::find_if(tok->values().begin(), tok->values().end(), [](const ValueFlow::Value& v) {
+                return v.isIntValue();
+            });
+            alwaysTrueFalseError(tok, condition, &*it);
         }
     }
 }
 
 void CheckCondition::alwaysTrueFalseError(const Token* tok, const Token* condition, const ValueFlow::Value* value)
 {
-    const bool alwaysTrue = value && (value->intvalue != 0);
+    const bool alwaysTrue = value && (value->intvalue != 0 || value->isImpossible());
     const std::string expr = tok ? tok->expressionString() : std::string("x");
     const std::string conditionStr = (Token::simpleMatch(condition, "return") ? "Return value" : "Condition");
     const std::string errmsg = conditionStr + " '" + expr + "' is always " + (alwaysTrue ? "true" : "false");
diff --git a/lib/checkcondition.h b/lib/checkcondition.h
index 57e09c50b49..948dd7be217 100644
--- a/lib/checkcondition.h
+++ b/lib/checkcondition.h
@@ -26,13 +26,13 @@
 #include "config.h"
 #include "mathlib.h"
 #include "errortypes.h"
+#include "tokenize.h"
 
 #include <set>
 #include <string>
 
 class Settings;
 class Token;
-class Tokenizer;
 class ErrorLogger;
 class ValueType;
 
@@ -56,8 +56,8 @@ class CPPCHECKLIB CheckCondition : public Check {
     CheckCondition(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckCondition checkCondition(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckCondition checkCondition(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkCondition.multiCondition();
         checkCondition.clarifyCondition();   // not simplified because ifAssign
         checkCondition.multiCondition2();
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 6f90b881c7a..f70573c4bc2 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -53,11 +53,11 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
     CheckExceptionSafety(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (tokenizer.isC())
             return;
 
-        CheckExceptionSafety checkExceptionSafety(tokenizer, settings, errorLogger);
+        CheckExceptionSafety checkExceptionSafety(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkExceptionSafety.destructors();
         checkExceptionSafety.deallocThrow();
         checkExceptionSafety.checkRethrowCopy();
diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
index bff40c2eb00..05502a870f3 100644
--- a/lib/checkfunctions.h
+++ b/lib/checkfunctions.h
@@ -27,13 +27,13 @@
 #include "errortypes.h"
 #include "library.h"
 #include "settings.h"
+#include "tokenize.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
 class Token;
-class Tokenizer;
 class ErrorLogger;
 
 namespace ValueFlow {
@@ -58,8 +58,8 @@ class CPPCHECKLIB CheckFunctions : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckFunctions checkFunctions(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckFunctions checkFunctions(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         checkFunctions.checkIgnoredReturnValue();
         checkFunctions.checkMissingReturn();  // Missing "return" in exit path
diff --git a/lib/checkinternal.h b/lib/checkinternal.h
index 4d44204de8c..e827d3c4eac 100644
--- a/lib/checkinternal.h
+++ b/lib/checkinternal.h
@@ -26,12 +26,12 @@
 #include "config.h"
 #include "errortypes.h"
 #include "settings.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -47,11 +47,11 @@ class CPPCHECKLIB CheckInternal : public Check {
     CheckInternal(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!settings->checks.isEnabled(Checks::internalCheck))
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (!tokenizer.getSettings()->checks.isEnabled(Checks::internalCheck))
             return;
 
-        CheckInternal checkInternal(tokenizer, settings, errorLogger);
+        CheckInternal checkInternal(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         checkInternal.checkTokenMatchPatterns();
         checkInternal.checkTokenSimpleMatchPatterns();
diff --git a/lib/checkio.h b/lib/checkio.h
index 29c3344d5c1..a1fdcd10669 100644
--- a/lib/checkio.h
+++ b/lib/checkio.h
@@ -24,6 +24,7 @@
 #include "check.h"
 #include "config.h"
 #include "errortypes.h"
+#include "tokenize.h"
 
 #include <ostream>
 #include <string>
@@ -31,7 +32,6 @@
 class Function;
 class Settings;
 class Token;
-class Tokenizer;
 class Variable;
 class ErrorLogger;
 
@@ -49,8 +49,8 @@ class CPPCHECKLIB CheckIO : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks on the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckIO checkIO(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckIO checkIO(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         checkIO.checkWrongPrintfScanfArguments();
         checkIO.checkCoutCerrMisusage();
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
index 1d7cb5fb37e..06243f51341 100644
--- a/lib/checkleakautovar.h
+++ b/lib/checkleakautovar.h
@@ -25,6 +25,7 @@
 #include "check.h"
 #include "config.h"
 #include "library.h"
+#include "tokenize.h"
 
 #include <map>
 #include <set>
@@ -34,7 +35,6 @@
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 
 class CPPCHECKLIB VarInfo {
@@ -115,8 +115,8 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
     CheckLeakAutoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckLeakAutoVar checkLeakAutoVar(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckLeakAutoVar checkLeakAutoVar(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkLeakAutoVar.check();
     }
 
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index f42a88f8831..7612091c29b 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -293,7 +293,7 @@ void CheckMemoryLeak::reportErr(const std::list<const Token *> &callstack, Sever
     if (mErrorLogger_)
         mErrorLogger_->reportErr(errmsg);
     else
-        Check::reportError(errmsg);
+        Check::writeToErrorList(errmsg);
 }
 
 void CheckMemoryLeak::memleakError(const Token *tok, const std::string &varname) const
diff --git a/lib/checkmemoryleak.h b/lib/checkmemoryleak.h
index 48144668fcd..435530a8f75 100644
--- a/lib/checkmemoryleak.h
+++ b/lib/checkmemoryleak.h
@@ -172,8 +172,8 @@ class CPPCHECKLIB CheckMemoryLeakInFunction : private Check, public CheckMemoryL
     CheckMemoryLeakInFunction(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakInFunction checkMemoryLeak(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.checkReallocUsage();
     }
 
@@ -224,11 +224,11 @@ class CPPCHECKLIB CheckMemoryLeakInClass : private Check, private CheckMemoryLea
     CheckMemoryLeakInClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer *tokenizr, const Settings *settings, ErrorLogger *errLog) override {
-        if (!tokenizr->isCPP())
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (!tokenizer.isCPP())
             return;
 
-        CheckMemoryLeakInClass checkMemoryLeak(tokenizr, settings, errLog);
+        CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 
@@ -269,8 +269,8 @@ class CPPCHECKLIB CheckMemoryLeakStructMember : private Check, private CheckMemo
     CheckMemoryLeakStructMember(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakStructMember checkMemoryLeak(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 
@@ -305,8 +305,8 @@ class CPPCHECKLIB CheckMemoryLeakNoVar : private Check, private CheckMemoryLeak
     CheckMemoryLeakNoVar(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakNoVar checkMemoryLeak(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 
diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
index 6751e00bc9b..e3b7c2714be 100644
--- a/lib/checknullpointer.h
+++ b/lib/checknullpointer.h
@@ -25,6 +25,7 @@
 #include "check.h"
 #include "config.h"
 #include "ctu.h"
+#include "tokenize.h"
 #include "vfvalue.h"
 
 #include <list>
@@ -34,7 +35,6 @@ class ErrorLogger;
 class Library;
 class Settings;
 class Token;
-class Tokenizer;
 
 namespace tinyxml2 {
     class XMLElement;
@@ -56,8 +56,8 @@ class CPPCHECKLIB CheckNullPointer : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckNullPointer checkNullPointer(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckNullPointer checkNullPointer(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkNullPointer.nullPointer();
         checkNullPointer.arithmetic();
         checkNullPointer.nullConstantDereference();
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index f11a523a940..deaadbf7ca0 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -2139,7 +2139,7 @@ void CheckOther::checkMisusedScopedObject()
         return;
 
     auto getConstructorTok = [](const Token* tok, std::string& typeStr) -> const Token* {
-        if (!Token::Match(tok, "[;{}] %name%"))
+        if (!Token::Match(tok, "[;{}] %name%") || tok->next()->isKeyword())
             return nullptr;
         tok = tok->next();
         typeStr.clear();
@@ -3388,7 +3388,7 @@ void CheckOther::checkAccessOfMovedVariable()
                 else
                     inconclusive = true;
             } else {
-                const ExprUsage usage = getExprUsage(tok, 0, mSettings);
+                const ExprUsage usage = getExprUsage(tok, 0, mSettings, mTokenizer->isCPP());
                 if (usage == ExprUsage::Used)
                     accessOfMoved = true;
                 if (usage == ExprUsage::PassedByReference)
@@ -3518,7 +3518,7 @@ void CheckOther::funcArgNamesDifferent(const std::string & functionName, nonneg
     std::list<const Token *> tokens = { declaration,definition };
     reportError(tokens, Severity::style, "funcArgNamesDifferent",
                 "$symbol:" + functionName + "\n"
-                "Function '$symbol' argument " + MathLib::toString(index + 1) + " names different: declaration '" +
+                "Function '$symbol' argument " + std::to_string(index + 1) + " names different: declaration '" +
                 (declaration ? declaration->str() : std::string("A")) + "' definition '" +
                 (definition ? definition->str() : std::string("B")) + "'.", CWE628, Certainty::inconclusive);
 }
@@ -3529,8 +3529,8 @@ void CheckOther::funcArgOrderDifferent(const std::string & functionName,
                                        const std::vector<const Token *> & definitions)
 {
     std::list<const Token *> tokens = {
-        declarations.size() ? declarations[0] ? declarations[0] : declaration : nullptr,
-        definitions.size() ? definitions[0] ? definitions[0] : definition : nullptr
+        !declarations.empty() ? declarations[0] ? declarations[0] : declaration : nullptr,
+        !definitions.empty() ? definitions[0] ? definitions[0] : definition : nullptr
     };
     std::string msg = "$symbol:" + functionName + "\nFunction '$symbol' argument order different: declaration '";
     for (int i = 0; i < declarations.size(); ++i) {
@@ -3647,17 +3647,23 @@ void CheckOther::checkKnownArgument()
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope *functionScope : symbolDatabase->functionScopes) {
         for (const Token *tok = functionScope->bodyStart; tok != functionScope->bodyEnd; tok = tok->next()) {
-            if (!Token::simpleMatch(tok->astParent(), "("))
+            if (!tok->hasKnownIntValue())
                 continue;
-            if (!Token::Match(tok->astParent()->previous(), "%name%"))
+            if (Token::Match(tok, "++|--|%assign%"))
                 continue;
-            if (Token::Match(tok->astParent()->previous(), "if|while|switch|sizeof"))
+            if (!Token::Match(tok->astParent(), "(|{|,"))
                 continue;
-            if (tok == tok->astParent()->previous())
+            if (tok->astParent()->isCast())
                 continue;
-            if (!tok->hasKnownIntValue())
+            int argn = -1;
+            const Token* ftok = getTokenArgumentFunction(tok, argn);
+            if (!ftok)
                 continue;
-            if (tok->tokType() == Token::eIncDecOp)
+            if (ftok->isCast())
+                continue;
+            if (Token::Match(ftok, "if|while|switch|sizeof"))
+                continue;
+            if (tok == tok->astParent()->previous())
                 continue;
             if (isConstVarExpression(tok))
                 continue;
@@ -3668,6 +3674,10 @@ void CheckOther::checkKnownArgument()
                 tok2 = tok2->astOperand2();
             if (isVariableExpression(tok2))
                 continue;
+            if (tok->isComparisonOp() &&
+                isSameExpression(
+                    mTokenizer->isCPP(), true, tok->astOperand1(), tok->astOperand2(), mSettings->library, true, true))
+                continue;
             // ensure that there is a integer variable in expression with unknown value
             std::string varexpr;
             bool isVariableExprHidden = false;  // Is variable expression explicitly hidden
@@ -3706,7 +3716,7 @@ void CheckOther::checkKnownArgument()
             strTolower(funcname);
             if (funcname.find("assert") != std::string::npos)
                 continue;
-            knownArgumentError(tok, tok->astParent()->previous(), &tok->values().front(), varexpr, isVariableExprHidden);
+            knownArgumentError(tok, ftok, &tok->values().front(), varexpr, isVariableExprHidden);
         }
     }
 }
diff --git a/lib/checkother.h b/lib/checkother.h
index 747f1e63857..b38c82e2cb8 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -25,6 +25,7 @@
 #include "check.h"
 #include "config.h"
 #include "errortypes.h"
+#include "tokenize.h"
 
 #include <string>
 #include <vector>
@@ -35,7 +36,6 @@ namespace ValueFlow {
 
 class Settings;
 class Token;
-class Tokenizer;
 class Function;
 class Variable;
 class ErrorLogger;
@@ -56,8 +56,8 @@ class CPPCHECKLIB CheckOther : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckOther checkOther(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckOther checkOther(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkOther.warningOldStylePointerCast();
diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
index 96aeec74578..500a38293f1 100644
--- a/lib/checkpostfixoperator.h
+++ b/lib/checkpostfixoperator.h
@@ -48,11 +48,11 @@ class CPPCHECKLIB CheckPostfixOperator : public Check {
     CheckPostfixOperator(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (tokenizer->isC())
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (tokenizer.isC())
             return;
 
-        CheckPostfixOperator checkPostfixOperator(tokenizer, settings, errorLogger);
+        CheckPostfixOperator checkPostfixOperator(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkPostfixOperator.postfixOperator();
     }
 
diff --git a/lib/checksizeof.h b/lib/checksizeof.h
index ad853c619dd..f47863c582c 100644
--- a/lib/checksizeof.h
+++ b/lib/checksizeof.h
@@ -24,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -48,8 +48,8 @@ class CPPCHECKLIB CheckSizeof : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer* tokenizer, const Settings* settings, ErrorLogger* errorLogger) override {
-        CheckSizeof checkSizeof(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger) override {
+        CheckSizeof checkSizeof(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkSizeof.sizeofsizeof();
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index e89eb254d61..6f7d6fa0463 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -203,14 +203,14 @@ void CheckStl::outOfBounds()
 static std::string indexValueString(const ValueFlow::Value& indexValue, const std::string& containerName = emptyString)
 {
     if (indexValue.isIteratorStartValue())
-        return "at position " + MathLib::toString(indexValue.intvalue) + " from the beginning";
+        return "at position " + std::to_string(indexValue.intvalue) + " from the beginning";
     if (indexValue.isIteratorEndValue())
-        return "at position " + MathLib::toString(-indexValue.intvalue) + " from the end";
-    std::string indexString = MathLib::toString(indexValue.intvalue);
+        return "at position " + std::to_string(-indexValue.intvalue) + " from the end";
+    std::string indexString = std::to_string(indexValue.intvalue);
     if (indexValue.isSymbolicValue()) {
         indexString = containerName + ".size()";
         if (indexValue.intvalue != 0)
-            indexString += "+" + MathLib::toString(indexValue.intvalue);
+            indexString += "+" + std::to_string(indexValue.intvalue);
     }
     if (indexValue.bound == ValueFlow::Value::Bound::Lower)
         return "greater or equal to " + indexString;
@@ -242,11 +242,11 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
             errmsg = "Out of bounds access in expression '" + expression + "' because '$symbol' is empty.";
     } else if (indexValue) {
         if (containerSize->condition)
-            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or $symbol size can be " + MathLib::toString(containerSize->intvalue) + ". Expression '" + expression + "' cause access out of bounds.";
+            errmsg = ValueFlow::eitherTheConditionIsRedundant(containerSize->condition) + " or $symbol size can be " + std::to_string(containerSize->intvalue) + ". Expression '" + expression + "' cause access out of bounds.";
         else if (indexValue->condition)
             errmsg = ValueFlow::eitherTheConditionIsRedundant(indexValue->condition) + " or '" + index + "' can have the value " + indexValueString(*indexValue) + ". Expression '" + expression + "' cause access out of bounds.";
         else
-            errmsg = "Out of bounds access in '" + expression + "', if '$symbol' size is " + MathLib::toString(containerSize->intvalue) + " and '" + index + "' is " + indexValueString(*indexValue);
+            errmsg = "Out of bounds access in '" + expression + "', if '$symbol' size is " + std::to_string(containerSize->intvalue) + " and '" + index + "' is " + indexValueString(*indexValue);
     } else {
         // should not happen
         return;
diff --git a/lib/checkstl.h b/lib/checkstl.h
index 0fd1dac0a4a..8ec207cfd1d 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -52,12 +52,12 @@ class CPPCHECKLIB CheckStl : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** run checks, the token list is not simplified */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        if (!tokenizer->isCPP()) {
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        if (!tokenizer.isCPP()) {
             return;
         }
 
-        CheckStl checkStl(tokenizer, settings, errorLogger);
+        CheckStl checkStl(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkStl.erase();
         checkStl.if_find();
         checkStl.checkFindInsert();
diff --git a/lib/checkstring.h b/lib/checkstring.h
index 94826c25fc0..c5cf999c3df 100644
--- a/lib/checkstring.h
+++ b/lib/checkstring.h
@@ -24,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -48,8 +48,8 @@ class CPPCHECKLIB CheckString : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckString checkString(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckString checkString(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkString.strPlusChar();
diff --git a/lib/checktype.cpp b/lib/checktype.cpp
index 3384bf69b5e..a15064122c1 100644
--- a/lib/checktype.cpp
+++ b/lib/checktype.cpp
@@ -437,7 +437,7 @@ void CheckType::checkFloatToIntegerOverflow()
             while (scope && scope->type != Scope::ScopeType::eLambda && scope->type != Scope::ScopeType::eFunction)
                 scope = scope->nestedIn;
             if (scope && scope->type == Scope::ScopeType::eFunction && scope->function && scope->function->retDef) {
-                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings, mTokenizer->isCPP());
+                const ValueType &valueType = ValueType::parseDecl(scope->function->retDef, *mSettings);
                 vtfloat = tok->astOperand1()->valueType();
                 checkFloatToIntegerOverflow(tok, &valueType, vtfloat, tok->astOperand1()->values());
             }
diff --git a/lib/checktype.h b/lib/checktype.h
index e403bf16dd0..c174691f6dc 100644
--- a/lib/checktype.h
+++ b/lib/checktype.h
@@ -24,6 +24,7 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 #include "vfvalue.h"
 
 #include <list>
@@ -32,7 +33,6 @@
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 class ValueType;
 
 /// @addtogroup Checks
@@ -51,9 +51,9 @@ class CPPCHECKLIB CheckType : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
         // These are not "simplified" because casts can't be ignored
-        CheckType checkType(tokenizer, settings, errorLogger);
+        CheckType checkType(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkType.checkTooBigBitwiseShift();
         checkType.checkIntegerOverflow();
         checkType.checkSignConversion();
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 887e38b61b8..239f1ad8d9a 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -709,8 +709,12 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
                     if (!membervar.empty()) {
                         if (!suppressErrors && Token::Match(tok, "%name% . %name%") && tok->strAt(2) == membervar && Token::Match(tok->next()->astParent(), "%cop%|return|throw|?"))
                             uninitStructMemberError(tok, tok->str() + "." + membervar);
-                        else if (mTokenizer->isCPP() && !suppressErrors && Token::Match(tok, "%name%") && Token::Match(tok->astParent(), "return|throw|?"))
-                            uninitStructMemberError(tok, tok->str() + "." + membervar);
+                        else if (mTokenizer->isCPP() && !suppressErrors && Token::Match(tok, "%name%") && Token::Match(tok->astParent(), "return|throw|?")) {
+                            if (std::any_of(tok->values().cbegin(), tok->values().cend(), [](const ValueFlow::Value& v) {
+                                return v.isUninitValue() && !v.isInconclusive();
+                            }))
+                                uninitStructMemberError(tok, tok->str() + "." + membervar);
+                        }
                     }
 
                     // Use variable
@@ -1488,8 +1492,10 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, All
     if (!isPointer && !Token::simpleMatch(tok->astParent(), ".") && Token::Match(tok->previous(), "[(,] %name% [,)]") && isVariableUsage(tok, isPointer, alloc))
         return true;
 
-    if (!isPointer && Token::Match(tok->previous(), "= %name% ;"))
-        return true;
+    if (!isPointer && Token::Match(tok->previous(), "= %name% ;")) {
+        const Token* lhs = tok->previous()->astOperand1();
+        return !(lhs && lhs->variable() && lhs->variable()->isReference() && lhs == lhs->variable()->nameToken());
+    }
 
     // = *(&var);
     if (!isPointer &&
@@ -1639,7 +1645,7 @@ void CheckUninitVar::valueFlowUninit()
                     if (!isleaf && Token::Match(tok->astParent(), ". %name%") && (tok->astParent()->next()->varId() || tok->astParent()->next()->isEnumerator()))
                         continue;
                 }
-                const ExprUsage usage = getExprUsage(tok, v->indirect, mSettings);
+                const ExprUsage usage = getExprUsage(tok, v->indirect, mSettings, mTokenizer->isCPP());
                 if (usage == ExprUsage::NotUsed || usage == ExprUsage::Inconclusive)
                     continue;
                 if (!v->subexpressions.empty() && usage == ExprUsage::PassedByReference)
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
index fbb645e07ca..ea9e75ed7d8 100644
--- a/lib/checkuninitvar.h
+++ b/lib/checkuninitvar.h
@@ -27,6 +27,7 @@
 #include "ctu.h"
 #include "mathlib.h"
 #include "errortypes.h"
+#include "tokenize.h"
 #include "vfvalue.h"
 
 #include <list>
@@ -36,7 +37,6 @@
 
 class Scope;
 class Token;
-class Tokenizer;
 class Variable;
 class ErrorLogger;
 class Settings;
@@ -69,8 +69,8 @@ class CPPCHECKLIB CheckUninitVar : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckUninitVar checkUninitVar(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckUninitVar checkUninitVar(&tokenizer, tokenizer.getSettings(), errorLogger);
         checkUninitVar.valueFlowUninit();
         checkUninitVar.check();
     }
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
index c0fa12c2f6b..4319b927cac 100644
--- a/lib/checkunusedfunctions.cpp
+++ b/lib/checkunusedfunctions.cpp
@@ -357,7 +357,7 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger * const errorLogger,
     if (errorLogger)
         errorLogger->reportErr(errmsg);
     else
-        reportError(errmsg);
+        Check::writeToErrorList(errmsg);
 }
 
 Check::FileInfo *CheckUnusedFunctions::getFileInfo(const Tokenizer *tokenizer, const Settings *settings) const
diff --git a/lib/checkunusedfunctions.h b/lib/checkunusedfunctions.h
index af008a17bd6..e0e58cf5b54 100644
--- a/lib/checkunusedfunctions.h
+++ b/lib/checkunusedfunctions.h
@@ -84,7 +84,7 @@ class CPPCHECKLIB CheckUnusedFunctions : public Check {
         CheckUnusedFunctions::unusedFunctionError(errorLogger, emptyString, 0, "funcName");
     }
 
-    void runChecks(const Tokenizer * /*tokenizer*/, const Settings * /*settings*/, ErrorLogger * /*errorLogger*/) override {}
+    void runChecks(const Tokenizer & /*tokenizer*/, ErrorLogger * /*errorLogger*/) override {}
 
     /**
      * Dummy implementation, just to provide error for --errorlist
diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
index 743a732ba42..843704f204d 100644
--- a/lib/checkunusedvar.h
+++ b/lib/checkunusedvar.h
@@ -23,6 +23,7 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <list>
 #include <map>
@@ -32,7 +33,6 @@ class ErrorLogger;
 class Scope;
 class Settings;
 class Token;
-class Tokenizer;
 class Type;
 class Variables;
 class Variable;
@@ -54,8 +54,8 @@ class CPPCHECKLIB CheckUnusedVar : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     /** @brief Run checks against the normal token list */
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckUnusedVar checkUnusedVar(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckUnusedVar checkUnusedVar(&tokenizer, tokenizer.getSettings(), errorLogger);
 
         // Coding style checks
         checkUnusedVar.checkStructMemberUsage();
diff --git a/lib/checkvaarg.h b/lib/checkvaarg.h
index de8dd3b2239..cd509e0d0d7 100644
--- a/lib/checkvaarg.h
+++ b/lib/checkvaarg.h
@@ -24,13 +24,13 @@
 
 #include "check.h"
 #include "config.h"
+#include "tokenize.h"
 
 #include <string>
 
 class ErrorLogger;
 class Settings;
 class Token;
-class Tokenizer;
 
 /// @addtogroup Checks
 /// @{
@@ -46,8 +46,8 @@ class CPPCHECKLIB CheckVaarg : public Check {
     CheckVaarg(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
-    void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) override {
-        CheckVaarg check(tokenizer, settings, errorLogger);
+    void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
+        CheckVaarg check(&tokenizer, tokenizer.getSettings(), errorLogger);
         check.va_start_argument();
         check.va_list_usage();
     }
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
index 7b91d6c4b07..2e68aaa26bd 100644
--- a/lib/clangimport.cpp
+++ b/lib/clangimport.cpp
@@ -630,7 +630,7 @@ void clangimport::AstNode::setValueType(Token *tok)
         if (!decl.front())
             break;
 
-        const ValueType valueType = ValueType::parseDecl(decl.front(), *mData->mSettings, true); // TODO: set isCpp
+        const ValueType valueType = ValueType::parseDecl(decl.front(), *mData->mSettings);
         if (valueType.type != ValueType::Type::UNKNOWN_TYPE) {
             tok->setValueType(new ValueType(valueType));
             break;
@@ -1545,7 +1545,7 @@ static void setValues(const Tokenizer *tokenizer, const SymbolDatabase *symbolDa
 
     for (Token *tok = const_cast<Token*>(tokenizer->tokens()); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
-            ValueType vt = ValueType::parseDecl(tok->tokAt(2), *settings, tokenizer->isCPP());
+            ValueType vt = ValueType::parseDecl(tok->tokAt(2), *settings);
             const int sz = vt.typeSize(settings->platform, true);
             if (sz <= 0)
                 continue;
diff --git a/lib/config.h b/lib/config.h
index 2f45debe005..d6ef3c37dc0 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -133,13 +133,26 @@ static const std::string emptyString;
 #define STRINGISIZE(...) #__VA_ARGS__
 
 #ifdef __clang__
-#define SUPPRESS_WARNING(warning, ...)_Pragma("clang diagnostic push") _Pragma(STRINGISIZE(clang diagnostic ignored warning)) __VA_ARGS__ _Pragma("clang diagnostic pop")
-#define SUPPRESS_DEPRECATED_WARNING(...) SUPPRESS_WARNING("-Wdeprecated", __VA_ARGS__)
-#define SUPPRESS_FLOAT_EQUAL_WARNING(...) SUPPRESS_WARNING("-Wfloat-equal", __VA_ARGS__)
+#define SUPPRESS_WARNING_PUSH(warning) _Pragma("clang diagnostic push") _Pragma(STRINGISIZE(clang diagnostic ignored warning))
+#define SUPPRESS_WARNING_POP _Pragma("clang diagnostic pop")
+#define SUPPRESS_WARNING_GCC_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning) SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP SUPPRESS_WARNING_POP
+#elif defined(__GNUC__)
+#define SUPPRESS_WARNING_PUSH(warning) _Pragma("GCC diagnostic push") _Pragma(STRINGISIZE(GCC diagnostic ignored warning))
+#define SUPPRESS_WARNING_POP _Pragma("GCC diagnostic pop")
+#define SUPPRESS_WARNING_GCC_PUSH(warning) SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP SUPPRESS_WARNING_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP
 #else
-#define SUPPRESS_WARNING(warning, ...) __VA_ARGS__
-#define SUPPRESS_DEPRECATED_WARNING(...) __VA_ARGS__
-#define SUPPRESS_FLOAT_EQUAL_WARNING(...) __VA_ARGS__
+#define SUPPRESS_WARNING_PUSH(warning)
+#define SUPPRESS_WARNING_POP
+#define SUPPRESS_WARNING_GCC_PUSH(warning)
+#define SUPPRESS_WARNING_GCC_POP
+#define SUPPRESS_WARNING_CLANG_PUSH(warning)
+#define SUPPRESS_WARNING_CLANG_POP
 #endif
 
 #if !defined(NO_WINDOWS_SEH) && defined(_WIN32) && defined(_MSC_VER)
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 074e5ce71ca..5ad7004439a 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -63,8 +63,7 @@
 #include <process.h>
 #endif
 
-#define PICOJSON_USE_INT64
-#include <picojson.h>
+#include "json.h"
 
 #include <simplecpp.h>
 
@@ -808,7 +807,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
             const std::list<Directive> &directives = preprocessor.getDirectives();
             for (const Directive &dir : directives) {
                 if (dir.str.compare(0,8,"#define ") == 0 || dir.str.compare(0,9,"#include ") == 0)
-                    code += "#line " + MathLib::toString(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
+                    code += "#line " + std::to_string(dir.linenr) + " \"" + dir.file + "\"\n" + dir.str + '\n';
             }
             Tokenizer tokenizer2(&mSettings, this);
             std::istringstream istr2(code);
@@ -940,13 +939,13 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
 
 #ifdef HAVE_RULES
                 // handling of "simple" rules has been removed.
-                if (mSimplify && hasRule("simple"))
+                if (hasRule("simple"))
                     throw InternalError(nullptr, "Handling of \"simple\" rules has been removed in Cppcheck. Use --addon instead.");
 #endif
 
             } catch (const simplecpp::Output &o) {
                 // #error etc during preprocessing
-                configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + MathLib::toString(o.location.line) + "] " + o.msg);
+                configurationError.push_back((mCurrentConfig.empty() ? "\'\'" : mCurrentConfig) + " : [" + o.location.file() + ':' + std::to_string(o.location.line) + "] " + o.msg);
                 --checkCount; // don't count invalid configurations
                 continue;
 
@@ -1022,7 +1021,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
     // In jointSuppressionReport mode, unmatched suppressions are
     // collected after all files are processed
     if (!mSettings.useSingleJob() && (mSettings.severity.isEnabled(Severity::information) || mSettings.checkConfiguration)) {
-        reportUnmatchedSuppressions(mSettings.nomsg.getUnmatchedLocalSuppressions(filename, isUnusedFunctionCheckEnabled()));
+        Suppressions::reportUnmatchedSuppressions(mSettings.nomsg.getUnmatchedLocalSuppressions(filename, isUnusedFunctionCheckEnabled()), *this);
     }
 
     mErrorList.clear();
@@ -1096,7 +1095,7 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
             continue;
 
         Timer timerRunChecks(check->name() + "::runChecks", mSettings.showtime, &s_timerResults);
-        check->runChecks(&tokenizer, &mSettings, this);
+        check->runChecks(tokenizer, this);
     }
 
     if (mSettings.clang)
@@ -1598,7 +1597,7 @@ void CppCheck::reportErr(const ErrorMessage &msg)
         mAnalyzerInformation.reportErr(msg);
 
     // TODO: only convert if necessary
-    const Suppressions::ErrorMessage errorMessage = msg.toSuppressionsErrorMessage();
+    const auto errorMessage = Suppressions::ErrorMessage::fromErrorMessage(msg);
 
     if (mSettings.nomsg.isSuppressed(errorMessage, mUseGlobalSuppressions)) {
         return;
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
index 925111ae75b..2de468d48ff 100644
--- a/lib/cppcheck.h
+++ b/lib/cppcheck.h
@@ -224,9 +224,6 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     /** Are there too many configs? */
     bool mTooManyConfigs{};
 
-    /** Simplify code? true by default */
-    bool mSimplify = true;
-
     /** File info used for whole program analysis */
     std::list<Check::FileInfo*> mFileInfo;
 
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index c64878713ba..28e4752d6b6 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-PCRE|Win32">
       <Configuration>Debug-PCRE</Configuration>
@@ -150,6 +150,7 @@
     <ClInclude Include="fwdanalysis.h" />
     <ClInclude Include="importproject.h" />
     <ClInclude Include="infer.h" />
+    <ClInclude Include="json.h" />
     <ClInclude Include="keywords.h" />
     <ClInclude Include="library.h" />
     <ClInclude Include="mathlib.h" />
diff --git a/lib/ctu.cpp b/lib/ctu.cpp
index d62f91bfb86..5105628c728 100644
--- a/lib/ctu.cpp
+++ b/lib/ctu.cpp
@@ -59,7 +59,7 @@ int CTU::maxCtuDepth = 2;
 
 std::string CTU::getFunctionId(const Tokenizer *tokenizer, const Function *function)
 {
-    return tokenizer->list.file(function->tokenDef) + ':' + MathLib::toString(function->tokenDef->linenr()) + ':' + MathLib::toString(function->tokenDef->column());
+    return tokenizer->list.file(function->tokenDef) + ':' + std::to_string(function->tokenDef->linenr()) + ':' + std::to_string(function->tokenDef->column());
 }
 
 CTU::FileInfo::Location::Location(const Tokenizer *tokenizer, const Token *tok)
@@ -579,7 +579,7 @@ std::list<ErrorMessage::FileLocation> CTU::FileInfo::getErrorPath(InvalidValueTy
         }
 
         ErrorMessage::FileLocation fileLoc(path[index]->location.fileName, path[index]->location.lineNumber, path[index]->location.column);
-        fileLoc.setinfo("Calling function " + path[index]->callFunctionName + ", " + MathLib::toString(path[index]->callArgNr) + getOrdinalText(path[index]->callArgNr) + " argument is " + value1);
+        fileLoc.setinfo("Calling function " + path[index]->callFunctionName + ", " + std::to_string(path[index]->callArgNr) + getOrdinalText(path[index]->callArgNr) + " argument is " + value1);
         locationList.push_back(std::move(fileLoc));
     }
 
diff --git a/lib/ctu.h b/lib/ctu.h
index a353ac1d7d7..7fdd0f09360 100644
--- a/lib/ctu.h
+++ b/lib/ctu.h
@@ -82,7 +82,7 @@ namespace CTU {
                 : callId(std::move(callId)), callArgNr(callArgNr), callFunctionName(std::move(callFunctionName)), location(std::move(loc))
             {}
             CallBase(const Tokenizer *tokenizer, const Token *callToken);
-            virtual ~CallBase() {}
+            virtual ~CallBase() = default;
             CallBase(const CallBase&) = default;
             std::string callId;
             int callArgNr{};
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 08ac7fbae7f..efe89308852 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -43,6 +43,7 @@ ErrorMessage::ErrorMessage()
     : severity(Severity::none), cwe(0U), certainty(Certainty::normal), hash(0)
 {}
 
+// TODO: id and msg are swapped compared to other calls
 ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity::SeverityType severity, const std::string &msg, std::string id, Certainty certainty) :
     callStack(std::move(callStack)), // locations for this error message
     id(std::move(id)),               // set the message id
@@ -57,7 +58,7 @@ ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1,
 }
 
 
-
+// TODO: id and msg are swapped compared to other calls
 ErrorMessage::ErrorMessage(std::list<FileLocation> callStack, std::string file1, Severity::SeverityType severity, const std::string &msg, std::string id, const CWE &cwe, Certainty certainty) :
     callStack(std::move(callStack)), // locations for this error message
     id(std::move(id)),               // set the message id
@@ -211,51 +212,50 @@ void ErrorMessage::setmsg(const std::string &msg)
     }
 }
 
-Suppressions::ErrorMessage ErrorMessage::toSuppressionsErrorMessage() const
+static void serializeString(std::string &oss, const std::string & str)
 {
-    Suppressions::ErrorMessage ret;
-    ret.hash = hash;
-    ret.errorId = id;
-    if (!callStack.empty()) {
-        ret.setFileName(callStack.back().getfile(false));
-        ret.lineNumber = callStack.back().line;
-    } else {
-        ret.lineNumber = Suppressions::Suppression::NO_LINE;
-    }
-    ret.certainty = certainty;
-    ret.symbolNames = mSymbolNames;
-    return ret;
+    oss += std::to_string(str.length());
+    oss += " ";
+    oss += str;
 }
 
-
 std::string ErrorMessage::serialize() const
 {
     // Serialize this message into a simple string
-    std::ostringstream oss;
-    oss << id.length() << " " << id;
-    oss << Severity::toString(severity).length() << " " << Severity::toString(severity);
-    oss << MathLib::toString(cwe.id).length() << " " << MathLib::toString(cwe.id);
-    oss << MathLib::toString(hash).length() << " " << MathLib::toString(hash);
-    oss << file0.size() << " " << file0;
+    std::string oss;
+    serializeString(oss, id);
+    serializeString(oss, Severity::toString(severity));
+    serializeString(oss, std::to_string(cwe.id));
+    serializeString(oss, std::to_string(hash));
+    serializeString(oss, file0);
     if (certainty == Certainty::inconclusive) {
         const std::string text("inconclusive");
-        oss << text.length() << " " << text;
+        serializeString(oss, text);
     }
 
     const std::string saneShortMessage = fixInvalidChars(mShortMessage);
     const std::string saneVerboseMessage = fixInvalidChars(mVerboseMessage);
 
-    oss << saneShortMessage.length() << " " << saneShortMessage;
-    oss << saneVerboseMessage.length() << " " << saneVerboseMessage;
-    oss << callStack.size() << " ";
+    serializeString(oss, saneShortMessage);
+    serializeString(oss, saneVerboseMessage);
+    oss += std::to_string(callStack.size());
+    oss += " ";
 
     for (std::list<ErrorMessage::FileLocation>::const_iterator loc = callStack.cbegin(); loc != callStack.cend(); ++loc) {
-        std::ostringstream smallStream;
-        smallStream << (*loc).line << '\t' << (*loc).column << '\t' << (*loc).getfile(false) << '\t' << loc->getOrigFile(false) << '\t' << loc->getinfo();
-        oss << smallStream.str().length() << " " << smallStream.str();
+        std::string frame;
+        frame += std::to_string((*loc).line);
+        frame += '\t';
+        frame += std::to_string((*loc).column);
+        frame += '\t';
+        frame += (*loc).getfile(false);
+        frame += '\t';
+        frame += loc->getOrigFile(false);
+        frame += '\t';
+        frame += loc->getinfo();
+        serializeString(oss, frame);
     }
 
-    return oss.str();
+    return oss;
 }
 
 void ErrorMessage::deserialize(const std::string &data)
@@ -446,7 +446,7 @@ std::string ErrorMessage::toXML() const
     if (cwe.id)
         printer.PushAttribute("cwe", cwe.id);
     if (hash)
-        printer.PushAttribute("hash", MathLib::toString(hash).c_str());
+        printer.PushAttribute("hash", std::to_string(hash).c_str());
     if (certainty == Certainty::inconclusive)
         printer.PushAttribute("inconclusive", "true");
 
@@ -609,14 +609,14 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
         pos1 = result.find("{inconclusive:", pos1);
     }
     findAndReplace(result, "{severity}", Severity::toString(severity));
-    findAndReplace(result, "{cwe}", MathLib::toString(cwe.id));
+    findAndReplace(result, "{cwe}", std::to_string(cwe.id));
     findAndReplace(result, "{message}", verbose ? mVerboseMessage : mShortMessage);
     if (!callStack.empty()) {
         if (result.find("{callstack}") != std::string::npos)
             findAndReplace(result, "{callstack}", ErrorLogger::callStackToString(callStack));
         findAndReplace(result, "{file}", callStack.back().getfile());
-        findAndReplace(result, "{line}", MathLib::toString(callStack.back().line));
-        findAndReplace(result, "{column}", MathLib::toString(callStack.back().column));
+        findAndReplace(result, "{line}", std::to_string(callStack.back().line));
+        findAndReplace(result, "{column}", std::to_string(callStack.back().column));
         if (result.find("{code}") != std::string::npos) {
             const std::string::size_type pos = result.find('\r');
             const char *endl;
@@ -645,8 +645,8 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
             std::string text = templateLocation;
 
             findAndReplace(text, "{file}", fileLocation.getfile());
-            findAndReplace(text, "{line}", MathLib::toString(fileLocation.line));
-            findAndReplace(text, "{column}", MathLib::toString(fileLocation.column));
+            findAndReplace(text, "{line}", std::to_string(fileLocation.line));
+            findAndReplace(text, "{column}", std::to_string(fileLocation.column));
             findAndReplace(text, "{info}", fileLocation.getinfo().empty() ? mShortMessage : fileLocation.getinfo());
             if (text.find("{code}") != std::string::npos) {
                 const std::string::size_type pos = text.find('\r');
@@ -666,39 +666,6 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
     return result;
 }
 
-bool ErrorLogger::reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched)
-{
-    bool err = false;
-    // Report unmatched suppressions
-    for (const Suppressions::Suppression &s : unmatched) {
-        // don't report "unmatchedSuppression" as unmatched
-        if (s.errorId == "unmatchedSuppression")
-            continue;
-
-        // check if this unmatched suppression is suppressed
-        bool suppressed = false;
-        for (const Suppressions::Suppression &s2 : unmatched) {
-            if (s2.errorId == "unmatchedSuppression") {
-                if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
-                    (s2.lineNumber == Suppressions::Suppression::NO_LINE || s2.lineNumber == s.lineNumber)) {
-                    suppressed = true;
-                    break;
-                }
-            }
-        }
-
-        if (suppressed)
-            continue;
-
-        std::list<ErrorMessage::FileLocation> callStack;
-        if (!s.fileName.empty())
-            callStack.emplace_back(s.fileName, s.lineNumber, 0);
-        reportErr(ErrorMessage(callStack, emptyString, Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
-        err = true;
-    }
-    return err;
-}
-
 std::string ErrorLogger::callStackToString(const std::list<ErrorMessage::FileLocation> &callStack)
 {
     std::string str;
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index ef8d8a71937..d9983df1b42 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -23,7 +23,6 @@
 
 #include "config.h"
 #include "errortypes.h"
-#include "suppressions.h"
 #include "color.h"
 
 #include <cstddef>
@@ -198,8 +197,6 @@ class CPPCHECKLIB ErrorMessage {
         return mSymbolNames;
     }
 
-    Suppressions::ErrorMessage toSuppressionsErrorMessage() const;
-
 private:
     static std::string fixInvalidChars(const std::string& raw);
 
@@ -219,8 +216,8 @@ class CPPCHECKLIB ErrorMessage {
  */
 class CPPCHECKLIB ErrorLogger {
 public:
-    ErrorLogger() {}
-    virtual ~ErrorLogger() {}
+    ErrorLogger() = default;
+    virtual ~ErrorLogger() = default;
 
     /**
      * Information about progress is directed here.
@@ -250,13 +247,6 @@ class CPPCHECKLIB ErrorLogger {
         (void)value;
     }
 
-    /**
-     * Report unmatched suppressions
-     * @param unmatched list of unmatched suppressions (from Settings::Suppressions::getUnmatched(Local|Global)Suppressions)
-     * @return true is returned if errors are reported
-     */
-    bool reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched);
-
     static std::string callStackToString(const std::list<ErrorMessage::FileLocation> &callStack);
 
     /**
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
index fea0526eb5d..09abde664c1 100644
--- a/lib/forwardanalyzer.cpp
+++ b/lib/forwardanalyzer.cpp
@@ -488,7 +488,7 @@ struct ForwardTraversal {
             if (allAnalysis.isIncremental())
                 return Break(Analyzer::Terminate::Bail);
         } else if (allAnalysis.isModified()) {
-            std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, allAnalysis.isModified());
+            std::vector<ForwardTraversal> ftv = tryForkScope(endBlock, /*isModified*/ true);
             bool forkContinue = true;
             for (ForwardTraversal& ft : ftv) {
                 if (condTok)
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
index 76403ff40db..0537851a5d0 100644
--- a/lib/importproject.cpp
+++ b/lib/importproject.cpp
@@ -40,8 +40,7 @@
 
 #include <simplecpp.h>
 
-#define PICOJSON_USE_INT64
-#include <picojson.h>
+#include "json.h"
 
 ImportProject::ImportProject()
 {
diff --git a/lib/infer.h b/lib/infer.h
index 21ffcb22c25..35d2afb1822 100644
--- a/lib/infer.h
+++ b/lib/infer.h
@@ -33,7 +33,7 @@ template<class T> class ValuePtr;
 struct InferModel {
     virtual bool match(const ValueFlow::Value& value) const = 0;
     virtual ValueFlow::Value yield(MathLib::bigint value) const = 0;
-    virtual ~InferModel() {}
+    virtual ~InferModel() = default;
     InferModel(const InferModel&) = default;
 protected:
     InferModel() = default;
diff --git a/lib/json.h b/lib/json.h
new file mode 100644
index 00000000000..521d6b9c9cf
--- /dev/null
+++ b/lib/json.h
@@ -0,0 +1,33 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2023 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef jsonH
+#define jsonH
+
+SUPPRESS_WARNING_PUSH("-Wfloat-equal")
+SUPPRESS_WARNING_CLANG_PUSH("-Wtautological-type-limit-compare")
+SUPPRESS_WARNING_GCC_PUSH("-Wparentheses")
+
+#define PICOJSON_USE_INT64
+#include <picojson.h>
+
+SUPPRESS_WARNING_GCC_POP
+SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_POP
+
+#endif // jsonH
diff --git a/lib/keywords.cpp b/lib/keywords.cpp
index 70fb2f6e341..87f1bef35d4 100644
--- a/lib/keywords.cpp
+++ b/lib/keywords.cpp
@@ -18,6 +18,8 @@
 
 #include "keywords.h"
 
+#include <cassert>
+
 // see https://en.cppreference.com/w/c/keyword
 
 #define C90_KEYWORDS \
@@ -162,6 +164,7 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
         /*case Standards::cstd_t::C23:
             return c23_keywords_all;*/
     }
+    assert(false && "unreachable");
 }
 
 // cppcheck-suppress unusedFunction
@@ -181,6 +184,7 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cppstd_t cppS
     case Standards::cppstd_t::CPP23:
         return cpp23_keywords_all;
     }
+    assert(false && "unreachable");
 }
 
 // cppcheck-suppress unusedFunction
@@ -197,6 +201,7 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
         /*case Standards::cstd_t::C23:
             return c23_keywords_all;*/
     }
+    assert(false && "unreachable");
 }
 
 // cppcheck-suppress unusedFunction
@@ -217,5 +222,6 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cppstd_t cpp
     case Standards::cppstd_t::CPP23:
         return cpp23_keywords;
     }
+    assert(false && "unreachable");
 }
 
diff --git a/lib/lib.pri b/lib/lib.pri
index c6347fec6c6..09676f2dede 100644
--- a/lib/lib.pri
+++ b/lib/lib.pri
@@ -44,6 +44,7 @@ HEADERS += $${PWD}/analyzer.h \
            $${PWD}/fwdanalysis.h \
            $${PWD}/importproject.h \
            $${PWD}/infer.h \
+           $${PWD}/json.h \
            $${PWD}/keywords.h \
            $${PWD}/library.h \
            $${PWD}/mathlib.h \
diff --git a/lib/library.cpp b/lib/library.cpp
index 4142dcd8ae1..15d64917113 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -419,7 +419,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
 
             const char* const inherits = node->Attribute("inherits");
             if (inherits) {
-                const std::map<std::string, Container>::const_iterator i = containers.find(inherits);
+                const std::unordered_map<std::string, Container>::const_iterator i = containers.find(inherits);
                 if (i != containers.end())
                     container = i->second; // Take values from parent and overwrite them if necessary
                 else
@@ -1158,8 +1158,17 @@ bool Library::isScopeNoReturn(const Token *end, std::string *unknownFunc) const
     return false;
 }
 
-const Library::Container* Library::detectContainerInternal(const Token* typeStart, DetectContainer detect, bool* isIterator, bool withoutStd) const
+const Library::Container* Library::detectContainerInternal(const Token* const typeStart, DetectContainer detect, bool* isIterator, bool withoutStd) const
 {
+    const Token* firstLinkedTok = nullptr;
+    for (const Token* tok = typeStart; tok && !tok->varId(); tok = tok->next()) {
+        if (!tok->link())
+            continue;
+
+        firstLinkedTok = tok;
+        break;
+    }
+
     for (const std::pair<const std::string, Library::Container> & c : containers) {
         const Container& container = c.second;
         if (container.startPattern.empty())
@@ -1177,23 +1186,22 @@ const Library::Container* Library::detectContainerInternal(const Token* typeStar
             return &container;
         }
 
-        for (const Token* tok = typeStart; tok && !tok->varId(); tok = tok->next()) {
-            if (!tok->link())
-                continue;
+        if (!firstLinkedTok)
+            continue;
 
-            const bool matchedStartPattern = Token::Match(typeStart, container.startPattern2.c_str() + offset);
+        const bool matchedStartPattern = Token::Match(typeStart, container.startPattern2.c_str() + offset);
+        if (!matchedStartPattern)
+            continue;
 
-            if (detect != ContainerOnly && matchedStartPattern && Token::Match(tok->link(), container.itEndPattern.c_str())) {
-                if (isIterator)
-                    *isIterator = true;
-                return &container;
-            }
-            if (detect != IteratorOnly && matchedStartPattern && Token::Match(tok->link(), container.endPattern.c_str())) {
-                if (isIterator)
-                    *isIterator = false;
-                return &container;
-            }
-            break;
+        if (detect != ContainerOnly && Token::Match(firstLinkedTok->link(), container.itEndPattern.c_str())) {
+            if (isIterator)
+                *isIterator = true;
+            return &container;
+        }
+        if (detect != IteratorOnly && Token::Match(firstLinkedTok->link(), container.endPattern.c_str())) {
+            if (isIterator)
+                *isIterator = false;
+            return &container;
         }
     }
     return nullptr;
diff --git a/lib/library.h b/lib/library.h
index 300382d9fc7..9c1b060f9ac 100644
--- a/lib/library.h
+++ b/lib/library.h
@@ -282,7 +282,7 @@ class CPPCHECKLIB Library {
         static Yield yieldFrom(const std::string& yieldName);
         static Action actionFrom(const std::string& actionName);
     };
-    std::map<std::string, Container> containers;
+    std::unordered_map<std::string, Container> containers;
     const Container* detectContainer(const Token* typeStart) const;
     const Container* detectIterator(const Token* typeStart) const;
     const Container* detectContainerOrIterator(const Token* typeStart, bool* isIterator = nullptr, bool withoutStd = false) const;
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 7feef1f8c57..5a3b65f17fd 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -1059,7 +1059,7 @@ std::string MathLib::add(const std::string & first, const std::string & second)
     return (value(first) + value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) + toLongNumber(second)) + intsuffix(first, second);
+        return std::to_string(toLongNumber(first) + toLongNumber(second)) + intsuffix(first, second);
     }
 
     double d1 = toDoubleNumber(first);
@@ -1081,7 +1081,7 @@ std::string MathLib::subtract(const std::string &first, const std::string &secon
     return (value(first) - value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) - toLongNumber(second)) + intsuffix(first, second);
+        return std::to_string(toLongNumber(first) - toLongNumber(second)) + intsuffix(first, second);
     }
 
     if (first == second)
@@ -1112,7 +1112,7 @@ std::string MathLib::divide(const std::string &first, const std::string &second)
             throw InternalError(nullptr, "Internal Error: Division by zero");
         if (a == std::numeric_limits<bigint>::min() && std::abs(b)<=1)
             throw InternalError(nullptr, "Internal Error: Division overflow");
-        return toString(toLongNumber(first) / b) + intsuffix(first, second);
+        return std::to_string(toLongNumber(first) / b) + intsuffix(first, second);
     }
     if (isNullValue(second)) {
         if (isNullValue(first))
@@ -1129,7 +1129,7 @@ std::string MathLib::multiply(const std::string &first, const std::string &secon
     return (value(first) * value(second)).str();
 #else
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
-        return toString(toLongNumber(first) * toLongNumber(second)) + intsuffix(first, second);
+        return std::to_string(toLongNumber(first) * toLongNumber(second)) + intsuffix(first, second);
     }
     return toString(toDoubleNumber(first) * toDoubleNumber(second));
 #endif
@@ -1144,7 +1144,7 @@ std::string MathLib::mod(const std::string &first, const std::string &second)
         const bigint b = toLongNumber(second);
         if (b == 0)
             throw InternalError(nullptr, "Internal Error: Division by zero");
-        return toString(toLongNumber(first) % b) + intsuffix(first, second);
+        return std::to_string(toLongNumber(first) % b) + intsuffix(first, second);
     }
     return toString(std::fmod(toDoubleNumber(first),toDoubleNumber(second)));
 #endif
@@ -1169,13 +1169,13 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco
         return MathLib::mod(first, second);
 
     case '&':
-        return MathLib::toString(MathLib::toLongNumber(first) & MathLib::toLongNumber(second)) + intsuffix(first,second);
+        return std::to_string(MathLib::toLongNumber(first) & MathLib::toLongNumber(second)) + intsuffix(first,second);
 
     case '|':
-        return MathLib::toString(MathLib::toLongNumber(first) | MathLib::toLongNumber(second)) + intsuffix(first,second);
+        return std::to_string(MathLib::toLongNumber(first) | MathLib::toLongNumber(second)) + intsuffix(first,second);
 
     case '^':
-        return MathLib::toString(MathLib::toLongNumber(first) ^ MathLib::toLongNumber(second)) + intsuffix(first,second);
+        return std::to_string(MathLib::toLongNumber(first) ^ MathLib::toLongNumber(second)) + intsuffix(first,second);
 
     default:
         throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to Cppcheck developers.");
diff --git a/lib/mathlib.h b/lib/mathlib.h
index 9bab55a8d82..a7e4b3c8806 100644
--- a/lib/mathlib.h
+++ b/lib/mathlib.h
@@ -74,9 +74,7 @@ class CPPCHECKLIB MathLib {
     /** @brief for conversion of numeric literals - for atoi-like conversions please use strToInt() */
     static biguint toULongNumber(const std::string & str);
 
-    template<class T> static std::string toString(T value) {
-        return std::to_string(value);
-    }
+    template<class T> static std::string toString(T value) = delete;
     /** @brief for conversion of numeric literals */
     static double toDoubleNumber(const std::string & str);
 
@@ -147,7 +145,7 @@ MathLib::value operator^(const MathLib::value &v1, const MathLib::value &v2);
 MathLib::value operator<<(const MathLib::value &v1, const MathLib::value &v2);
 MathLib::value operator>>(const MathLib::value &v1, const MathLib::value &v2);
 
-template<> CPPCHECKLIB std::string MathLib::toString<double>(double value); // Declare specialization to avoid linker problems
+template<> CPPCHECKLIB std::string MathLib::toString<double>(double value);
 
 /// @}
 //---------------------------------------------------------------------------
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 1efc55c9015..de7add238a8 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -24,8 +24,7 @@
 
 #include <fstream>
 
-#define PICOJSON_USE_INT64
-#include <picojson.h>
+#include "json.h"
 
 std::atomic<bool> Settings::mTerminated;
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index 8b0095edc6b..eac6ae6cf39 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -35,6 +35,22 @@
 
 #include <tinyxml2.h>
 
+Suppressions::ErrorMessage Suppressions::ErrorMessage::fromErrorMessage(const ::ErrorMessage &msg)
+{
+    Suppressions::ErrorMessage ret;
+    ret.hash = msg.hash;
+    ret.errorId = msg.id;
+    if (!msg.callStack.empty()) {
+        ret.setFileName(msg.callStack.back().getfile(false));
+        ret.lineNumber = msg.callStack.back().line;
+    } else {
+        ret.lineNumber = Suppressions::Suppression::NO_LINE;
+    }
+    ret.certainty = msg.certainty;
+    ret.symbolNames = msg.symbolNames();
+    return ret;
+}
+
 static bool isAcceptedErrorIdChar(char c)
 {
     switch (c) {
@@ -356,11 +372,11 @@ std::string Suppressions::Suppression::getText() const
     if (!fileName.empty())
         ret += " fileName=" + fileName;
     if (lineNumber != NO_LINE)
-        ret += " lineNumber=" + MathLib::toString(lineNumber);
+        ret += " lineNumber=" + std::to_string(lineNumber);
     if (!symbolName.empty())
         ret += " symbolName=" + symbolName;
     if (hash > 0)
-        ret += " hash=" + MathLib::toString(hash);
+        ret += " hash=" + std::to_string(hash);
     if (ret.compare(0,1," ")==0)
         return ret.substr(1);
     return ret;
@@ -384,7 +400,7 @@ bool Suppressions::isSuppressed(const ::ErrorMessage &errmsg)
 {
     if (mSuppressions.empty())
         return false;
-    return isSuppressed(errmsg.toSuppressionsErrorMessage());
+    return isSuppressed(Suppressions::ErrorMessage::fromErrorMessage(errmsg));
 }
 
 void Suppressions::dump(std::ostream & out) const
@@ -461,3 +477,36 @@ void Suppressions::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tok
         }
     }
 }
+
+bool Suppressions::reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched, ErrorLogger &errorLogger)
+{
+    bool err = false;
+    // Report unmatched suppressions
+    for (const Suppressions::Suppression &s : unmatched) {
+        // don't report "unmatchedSuppression" as unmatched
+        if (s.errorId == "unmatchedSuppression")
+            continue;
+
+        // check if this unmatched suppression is suppressed
+        bool suppressed = false;
+        for (const Suppressions::Suppression &s2 : unmatched) {
+            if (s2.errorId == "unmatchedSuppression") {
+                if ((s2.fileName.empty() || s2.fileName == "*" || s2.fileName == s.fileName) &&
+                    (s2.lineNumber == Suppressions::Suppression::NO_LINE || s2.lineNumber == s.lineNumber)) {
+                    suppressed = true;
+                    break;
+                }
+            }
+        }
+
+        if (suppressed)
+            continue;
+
+        std::list<::ErrorMessage::FileLocation> callStack;
+        if (!s.fileName.empty())
+            callStack.emplace_back(s.fileName, s.lineNumber, 0);
+        errorLogger.reportErr(::ErrorMessage(callStack, emptyString, Severity::information, "Unmatched suppression: " + s.errorId, "unmatchedSuppression", Certainty::normal));
+        err = true;
+    }
+    return err;
+}
diff --git a/lib/suppressions.h b/lib/suppressions.h
index cc64ee51cef..6e1fd9c9e52 100644
--- a/lib/suppressions.h
+++ b/lib/suppressions.h
@@ -34,6 +34,7 @@
 
 class Tokenizer;
 class ErrorMessage;
+class ErrorLogger;
 enum class Certainty;
 
 /** @brief class for handling suppressions */
@@ -50,6 +51,8 @@ class CPPCHECKLIB Suppressions {
         int lineNumber;
         Certainty certainty;
         std::string symbolNames;
+
+        static Suppressions::ErrorMessage fromErrorMessage(const ::ErrorMessage &msg);
     private:
         std::string mFileName;
     };
@@ -201,6 +204,13 @@ class CPPCHECKLIB Suppressions {
      */
     void markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &tokenizer);
 
+    /**
+     * Report unmatched suppressions
+     * @param unmatched list of unmatched suppressions (from Settings::Suppressions::getUnmatched(Local|Global)Suppressions)
+     * @return true is returned if errors are reported
+     */
+    static bool reportUnmatchedSuppressions(const std::list<Suppressions::Suppression> &unmatched, ErrorLogger &errorLogger);
+
 private:
     /** @brief List of error which the user doesn't want to see. */
     std::list<Suppression> mSuppressions;
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 4712e646ec8..f64caa82e27 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -2214,12 +2214,13 @@ void Variable::evaluate(const Settings* settings)
 
     const Library * const lib = &settings->library;
 
+    // TODO: ValueType::parseDecl() is also performing a container lookup
     bool isContainer = false;
     if (mNameToken)
         setFlag(fIsArray, arrayDimensions(settings, isContainer));
 
     if (mTypeStartToken)
-        setValueType(ValueType::parseDecl(mTypeStartToken,*settings, true)); // TODO: set isCpp
+        setValueType(ValueType::parseDecl(mTypeStartToken,*settings));
 
     const Token* tok = mTypeStartToken;
     while (tok && tok->previous() && tok->previous()->isName())
@@ -2275,7 +2276,7 @@ void Variable::evaluate(const Settings* settings)
         setFlag(fIsClass, !lib->podtype(strtype) && !mTypeStartToken->isStandardType() && !isEnumType() && !isPointer() && !isReference() && strtype != "...");
         setFlag(fIsStlType, Token::simpleMatch(mTypeStartToken, "std ::"));
         setFlag(fIsStlString, ::isStlStringType(mTypeStartToken));
-        setFlag(fIsSmartPointer, lib->isSmartPointer(mTypeStartToken));
+        setFlag(fIsSmartPointer, mTypeStartToken->isCpp() && lib->isSmartPointer(mTypeStartToken));
     }
     if (mAccess == AccessControl::Argument) {
         tok = mNameToken;
@@ -3025,21 +3026,21 @@ bool Function::returnsReference(const Function* function, bool unknown, bool inc
 
 bool Function::returnsPointer(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, false, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, false, [](const Token* /*defStart*/, const Token* defEnd) {
         return Token::simpleMatch(defEnd->previous(), "*");
     });
 }
 
 bool Function::returnsStandardType(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, true, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, true, [](const Token* /*defStart*/, const Token* defEnd) {
         return defEnd->previous() && defEnd->previous()->isStandardType();
     });
 }
 
 bool Function::returnsVoid(const Function* function, bool unknown)
 {
-    return checkReturns(function, unknown, true, [](UNUSED const Token* defStart, const Token* defEnd) {
+    return checkReturns(function, unknown, true, [](const Token* /*defStart*/, const Token* defEnd) {
         return Token::simpleMatch(defEnd->previous(), "void");
     });
 }
@@ -3558,7 +3559,7 @@ bool Type::isDerivedFrom(const std::string & ancestor) const
 bool Variable::arrayDimensions(const Settings* settings, bool& isContainer)
 {
     isContainer = false;
-    const Library::Container* container = settings->library.detectContainer(mTypeStartToken);
+    const Library::Container* container = (mTypeStartToken && mTypeStartToken->isCpp()) ? settings->library.detectContainer(mTypeStartToken) : nullptr;
     if (container && container->arrayLike_indexOp && container->size_templateArgNo > 0) {
         const Token* tok = Token::findsimplematch(mTypeStartToken, "<");
         if (tok) {
@@ -5653,7 +5654,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
             return tok1->valueType()->typeScope->findFunction(tok, tok1->valueType()->constness == 1);
         if (tok1 && Token::Match(tok1->previous(), "%name% (") && tok1->previous()->function() &&
             tok1->previous()->function()->retDef) {
-            ValueType vt = ValueType::parseDecl(tok1->previous()->function()->retDef, mSettings, mIsCpp);
+            ValueType vt = ValueType::parseDecl(tok1->previous()->function()->retDef, mSettings);
             if (vt.typeScope)
                 return vt.typeScope->findFunction(tok, vt.constness == 1);
         } else if (Token::Match(tok1, "%var% .")) {
@@ -5667,7 +5668,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
         } else if (Token::simpleMatch(tok->previous()->astOperand1(), "(")) {
             const Token *castTok = tok->previous()->astOperand1();
             if (castTok->isCast()) {
-                ValueType vt = ValueType::parseDecl(castTok->next(),mSettings, mIsCpp);
+                ValueType vt = ValueType::parseDecl(castTok->next(),mSettings);
                 if (vt.typeScope)
                     return vt.typeScope->findFunction(tok, vt.constness == 1);
             }
@@ -5697,7 +5698,7 @@ const Function* SymbolDatabase::findFunction(const Token* const tok) const
     }
     // Check for constructor
     if (Token::Match(tok, "%name% (|{")) {
-        ValueType vt = ValueType::parseDecl(tok, mSettings, mIsCpp);
+        ValueType vt = ValueType::parseDecl(tok, mSettings);
         if (vt.typeScope)
             return vt.typeScope->findFunction(tok, false);
     }
@@ -6552,6 +6553,11 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
                     setValueType(parent, *vt1);
                 return;
             }
+
+            if (vt1->isTypeEqual(vt2)) {
+                setValueType(parent, *vt1);
+                return;
+            }
         }
 
         if (vt1->pointer != 0U) {
@@ -6986,7 +6992,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             }
 
             // Construct smart pointer
-            else if (mSettings.library.isSmartPointer(start)) {
+            else if (mIsCpp && mSettings.library.isSmartPointer(start)) {
                 ValueType valuetype;
                 if (parsedecl(start, &valuetype, mDefaultSignedness, mSettings, mIsCpp)) {
                     setValueType(tok, valuetype);
@@ -7061,7 +7067,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                         }
                     }
                 }
-                if (tok->astParent() && Token::Match(tok->astOperand1(), "%name%|::")) {
+                if (mIsCpp && tok->astParent() && Token::Match(tok->astOperand1(), "%name%|::")) {
                     const Token *typeStartToken = tok->astOperand1();
                     while (typeStartToken && typeStartToken->str() == "::")
                         typeStartToken = typeStartToken->astOperand1();
@@ -7211,7 +7217,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
                 functionScope = functionScope->nestedIn;
             if (functionScope && functionScope->type == Scope::eFunction && functionScope->function &&
                 functionScope->function->retDef) {
-                ValueType vt = ValueType::parseDecl(functionScope->function->retDef, mSettings, mIsCpp);
+                ValueType vt = ValueType::parseDecl(functionScope->function->retDef, mSettings);
                 setValueType(tok, vt);
                 if (Token::simpleMatch(tok, "return {"))
                     setValueType(tok->next(), vt);
@@ -7309,10 +7315,10 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
     createSymbolDatabaseSetVariablePointers();
 }
 
-ValueType ValueType::parseDecl(const Token *type, const Settings &settings, bool isCpp)
+ValueType ValueType::parseDecl(const Token *type, const Settings &settings)
 {
     ValueType vt;
-    parsedecl(type, &vt, settings.platform.defaultSign == 'u' ? Sign::UNSIGNED : Sign::SIGNED, settings, isCpp);
+    parsedecl(type, &vt, settings.platform.defaultSign == 'u' ? Sign::UNSIGNED : Sign::SIGNED, settings, type->isCpp());
     return vt;
 }
 
@@ -7637,7 +7643,7 @@ void ValueType::setDebugPath(const Token* tok, SourceLocation ctx, SourceLocatio
     std::string file = ctx.file_name();
     if (file.empty())
         return;
-    std::string s = Path::stripDirectoryPart(file) + ":" + MathLib::toString(ctx.line()) + ": " + ctx.function_name() +
+    std::string s = Path::stripDirectoryPart(file) + ":" + std::to_string(ctx.line()) + ": " + ctx.function_name() +
                     " => " + local.function_name();
     debugPath.emplace_back(tok, std::move(s));
 }
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
index d7c50ee7a2a..8b988e54a02 100644
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@@ -1268,7 +1268,7 @@ class CPPCHECKLIB ValueType {
         originalTypeName(std::move(otn))
     {}
 
-    static ValueType parseDecl(const Token *type, const Settings &settings, bool isCpp);
+    static ValueType parseDecl(const Token *type, const Settings &settings);
 
     static Type typeFromString(const std::string &typestr, bool longType);
 
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index e551790a461..f906fbb91d9 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -284,9 +284,6 @@ TemplateSimplifier::TemplateSimplifier(Tokenizer &tokenizer)
     mErrorLogger(mTokenizer.mErrorLogger)
 {}
 
-TemplateSimplifier::~TemplateSimplifier()
-{}
-
 void TemplateSimplifier::checkComplicatedSyntaxErrorsInTemplates()
 {
     // check for more complicated syntax errors when using templates..
@@ -2486,17 +2483,17 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
                 }
 
                 else if (Token::Match(tok->next(), "( %type% * )")) {
-                    tok->str(MathLib::toString(mTokenizer.sizeOfType(tok->tokAt(3))));
+                    tok->str(std::to_string(mTokenizer.sizeOfType(tok->tokAt(3))));
                     tok->deleteNext(4);
                     again = true;
                 } else if (Token::simpleMatch(tok->next(), "( * )")) {
-                    tok->str(MathLib::toString(mTokenizer.sizeOfType(tok->tokAt(2))));
+                    tok->str(std::to_string(mTokenizer.sizeOfType(tok->tokAt(2))));
                     tok->deleteNext(3);
                     again = true;
                 } else if (Token::Match(tok->next(), "( %type% )")) {
                     const unsigned int size = mTokenizer.sizeOfType(tok->tokAt(2));
                     if (size > 0) {
-                        tok->str(MathLib::toString(size));
+                        tok->str(std::to_string(size));
                         tok->deleteNext(3);
                         again = true;
                     }
@@ -2681,7 +2678,7 @@ bool TemplateSimplifier::simplifyCalculations(Token* frontToken, const Token *ba
 
         if (validTokenEnd(bounded, tok, backToken, 3) &&
             Token::Match(tok->previous(), "(|&&|%oror% %char% %comp% %num% &&|%oror%|)")) {
-            tok->str(MathLib::toString(MathLib::toLongNumber(tok->str())));
+            tok->str(std::to_string(MathLib::toLongNumber(tok->str())));
         }
 
         if (validTokenEnd(bounded, tok, backToken, 5) &&
@@ -3088,7 +3085,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                                               Severity::information,
                                               "templateRecursion",
                                               "TemplateSimplifier: max template recursion ("
-                                              + MathLib::toString(mSettings.maxTemplateRecursion)
+                                              + std::to_string(mSettings.maxTemplateRecursion)
                                               + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",
                                               Certainty::normal);
                     mErrorLogger->reportErr(errmsg);
@@ -3359,7 +3356,7 @@ void TemplateSimplifier::replaceTemplateUsage(
         std::set<TemplateSimplifier::TokenAndName*>* pointers = nameTok->templateSimplifierPointers();
 
         // check if instantiation matches token instantiation from pointer
-        if (pointers && pointers->size()) {
+        if (pointers && !pointers->empty()) {
             // check full name
             if (instantiation.fullName() != (*pointers->begin())->fullName()) {
                 // FIXME:  fallback to just matching name
diff --git a/lib/templatesimplifier.h b/lib/templatesimplifier.h
index 763962ea24c..29b78fb8409 100644
--- a/lib/templatesimplifier.h
+++ b/lib/templatesimplifier.h
@@ -48,7 +48,6 @@ class CPPCHECKLIB TemplateSimplifier {
 
 public:
     explicit TemplateSimplifier(Tokenizer &tokenizer);
-    ~TemplateSimplifier();
 
     std::string dump() const {
         return mDump;
diff --git a/lib/timer.h b/lib/timer.h
index 1fe246f417d..34a5216d8d3 100644
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -37,7 +37,7 @@ enum class SHOWTIME_MODES {
 
 class CPPCHECKLIB TimerResultsIntf {
 public:
-    virtual ~TimerResultsIntf() {}
+    virtual ~TimerResultsIntf() = default;
 
     virtual void addResults(const std::string& str, std::clock_t clocks) = 0;
 };
@@ -54,7 +54,7 @@ struct TimerResultsData {
 
 class CPPCHECKLIB TimerResults : public TimerResultsIntf {
 public:
-    TimerResults() {}
+    TimerResults() = default;
 
     void showResults(SHOWTIME_MODES mode) const;
     void addResults(const std::string& str, std::clock_t clocks) override;
diff --git a/lib/token.cpp b/lib/token.cpp
index 0e9184626f3..6c832f3a741 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -424,7 +424,13 @@ const std::string &Token::strAt(int index) const
     return tok ? tok->mStr : emptyString;
 }
 
-static int multiComparePercent(const Token *tok, const char*& haystack, nonneg int varid)
+static
+#if defined(__GNUC__)
+// GCC does not inline this by itself
+// need to use the old syntax since the C++11 [[xxx:always_inline]] cannot be used here
+inline __attribute__((always_inline))
+#endif
+int multiComparePercent(const Token *tok, const char*& haystack, nonneg int varid)
 {
     ++haystack;
     // Compare only the first character of the string for optimization reasons
@@ -556,7 +562,12 @@ static int multiComparePercent(const Token *tok, const char*& haystack, nonneg i
     return 0xFFFF;
 }
 
-int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid)
+static
+#if defined(__GNUC__)
+// need to use the old syntax since the C++11 [[xxx:always_inline]] cannot be used here
+inline __attribute__((always_inline))
+#endif
+int multiCompareImpl(const Token *tok, const char *haystack, nonneg int varid)
 {
     const char *needle = tok->str().c_str();
     const char *needlePointer = needle;
@@ -609,6 +620,12 @@ int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid
     return -1;
 }
 
+// cppcheck-suppress unusedFunction - used in tests only
+int Token::multiCompare(const Token *tok, const char *haystack, nonneg int varid)
+{
+    return multiCompareImpl(tok, haystack, varid);
+}
+
 bool Token::simpleMatch(const Token *tok, const char pattern[], size_t pattern_len)
 {
     if (!tok)
@@ -730,7 +747,7 @@ bool Token::Match(const Token *tok, const char pattern[], nonneg int varid)
 
         // Parse multi options, such as void|int|char (accept token which is one of these 3)
         else {
-            const int res = multiCompare(tok, p, varid);
+            const int res = multiCompareImpl(tok, p, varid);
             if (res == 0) {
                 // Empty alternative matches, use the same token on next round
                 while (*p && *p != ' ')
@@ -1571,7 +1588,7 @@ static void astStringXml(const Token *tok, nonneg int indent, std::ostream &out)
 
     out << strindent << "<token str=\"" << tok->str() << '\"';
     if (tok->varId())
-        out << " varId=\"" << MathLib::toString(tok->varId()) << '\"';
+        out << " varId=\"" << tok->varId() << '\"';
     if (tok->variable())
         out << " variable=\"" << tok->variable() << '\"';
     if (tok->function())
@@ -2371,6 +2388,15 @@ bool Token::hasKnownIntValue() const
     });
 }
 
+bool Token::hasKnownBoolValue() const
+{
+    if (!mImpl->mValues)
+        return false;
+    return std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [](const ValueFlow::Value& value) {
+        return value.isIntValue() && (value.isKnown() || (value.intvalue == 0 && value.isImpossible()));
+    });
+}
+
 bool Token::hasKnownValue() const
 {
     return mImpl->mValues && std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), std::mem_fn(&ValueFlow::Value::isKnown));
@@ -2415,25 +2441,40 @@ const ValueFlow::Value* Token::getValue(const MathLib::bigint val) const
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
 
-const ValueFlow::Value* Token::getMaxValue(bool condition, MathLib::bigint path) const
+template<class Compare>
+static const ValueFlow::Value* getCompareValue(const std::list<ValueFlow::Value>& values,
+                                               bool condition,
+                                               MathLib::bigint path,
+                                               Compare compare)
 {
-    if (!mImpl->mValues)
-        return nullptr;
     const ValueFlow::Value* ret = nullptr;
-    for (const ValueFlow::Value& value : *mImpl->mValues) {
+    for (const ValueFlow::Value& value : values) {
         if (!value.isIntValue())
             continue;
         if (value.isImpossible())
             continue;
         if (path > -0 && value.path != 0 && value.path != path)
             continue;
-        if ((!ret || value.intvalue > ret->intvalue) &&
-            ((value.condition != nullptr) == condition))
+        if ((!ret || compare(value.intvalue, ret->intvalue)) && ((value.condition != nullptr) == condition))
             ret = &value;
     }
     return ret;
 }
 
+const ValueFlow::Value* Token::getMaxValue(bool condition, MathLib::bigint path) const
+{
+    if (!mImpl->mValues)
+        return nullptr;
+    return getCompareValue(*mImpl->mValues, condition, path, std::greater<MathLib::bigint>{});
+}
+
+const ValueFlow::Value* Token::getMinValue(bool condition, MathLib::bigint path) const
+{
+    if (!mImpl->mValues)
+        return nullptr;
+    return getCompareValue(*mImpl->mValues, condition, path, std::less<MathLib::bigint>{});
+}
+
 const ValueFlow::Value* Token::getMovedValue() const
 {
     if (!mImpl->mValues)
@@ -2545,3 +2586,11 @@ Token* findLambdaEndScope(Token* tok)
 const Token* findLambdaEndScope(const Token* tok) {
     return findLambdaEndScope(const_cast<Token*>(tok));
 }
+
+bool Token::isCpp() const
+{
+    if (mTokensFrontBack && mTokensFrontBack->list) {
+        return mTokensFrontBack->list->isCPP();
+    }
+    return true; // assume C++ by default
+}
diff --git a/lib/token.h b/lib/token.h
index d04d365d445..b8232638152 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -154,6 +154,8 @@ struct TokenImpl {
  * The Token class also has other functions for management of token list, matching tokens, etc.
  */
 class CPPCHECKLIB Token {
+    friend class TestToken;
+
 private:
     TokensFrontBack* mTokensFrontBack{};
 
@@ -788,6 +790,7 @@ class CPPCHECKLIB Token {
         return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, end, varId));
     }
 
+private:
     /**
      * Needle is build from multiple alternatives. If one of
      * them is equal to haystack, return value is 1. If there
@@ -804,6 +807,7 @@ class CPPCHECKLIB Token {
      */
     static int multiCompare(const Token *tok, const char *haystack, nonneg int varid);
 
+public:
     nonneg int fileIndex() const {
         return mImpl->mFileIndex;
     }
@@ -1212,6 +1216,7 @@ class CPPCHECKLIB Token {
     }
 
     bool hasKnownIntValue() const;
+    bool hasKnownBoolValue() const;
     bool hasKnownValue() const;
     bool hasKnownValue(ValueFlow::Value::ValueType t) const;
     bool hasKnownSymbolicValue(const Token* tok) const;
@@ -1224,6 +1229,7 @@ class CPPCHECKLIB Token {
     const ValueFlow::Value* getValue(const MathLib::bigint val) const;
 
     const ValueFlow::Value* getMaxValue(bool condition, MathLib::bigint path = 0) const;
+    const ValueFlow::Value* getMinValue(bool condition, MathLib::bigint path = 0) const;
 
     const ValueFlow::Value* getMovedValue() const;
 
@@ -1478,6 +1484,9 @@ class CPPCHECKLIB Token {
     void setTokenDebug(TokenDebug td) {
         mImpl->mDebug = td;
     }
+
+    /** defaults to C++ if it cannot be determined */
+    bool isCpp() const;
 };
 
 Token* findTypeEnd(Token* tok);
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index ec63858ff22..86a843c9632 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -448,7 +448,7 @@ static Token *splitDefinitionFromTypedef(Token *tok, nonneg int *unnamedCount)
             if (Token::Match(tok1->next(), "%type%"))
                 name = tok1->next()->str();
             else // create a unique name
-                name = "Unnamed" + MathLib::toString((*unnamedCount)++);
+                name = "Unnamed" + std::to_string((*unnamedCount)++);
             tok->next()->insertToken(name);
         } else
             return nullptr;
@@ -2920,7 +2920,7 @@ bool Tokenizer::simplifyUsing()
                 if (structEnd->strAt(2) == ";")
                     newName = name;
                 else
-                    newName = "Unnamed" + MathLib::toString(mUnnamedCount++);
+                    newName = "Unnamed" + std::to_string(mUnnamedCount++);
                 TokenList::copyTokens(structEnd->next(), tok, start);
                 structEnd->tokAt(5)->insertToken(newName, emptyString);
                 start->insertToken(newName, emptyString);
@@ -3737,7 +3737,7 @@ void Tokenizer::arraySize()
         Token* endStmt{};
         if (const Token* strTok = getStrTok(tok, addlength, &endStmt)) {
             const int sz = Token::getStrArraySize(strTok);
-            tok->next()->insertToken(MathLib::toString(sz));
+            tok->next()->insertToken(std::to_string(sz));
             tok = endStmt;
         }
 
@@ -3767,7 +3767,7 @@ void Tokenizer::arraySize()
             }
 
             if (sz != 0)
-                tok->insertToken(MathLib::toString(sz));
+                tok->insertToken(std::to_string(sz));
 
             tok = end->next() ? end->next() : end;
         }
@@ -3899,7 +3899,7 @@ void Tokenizer::simplifyCaseRange()
                 tok->insertToken("case");
                 for (MathLib::bigint i = end-1; i > start; i--) {
                     tok->insertToken(":");
-                    tok->insertToken(MathLib::toString(i));
+                    tok->insertToken(std::to_string(i));
                     tok->insertToken("case");
                 }
             }
@@ -5785,7 +5785,7 @@ void Tokenizer::printDebugOutput(int simplification) const
                 reportError(var->typeStartToken(),
                             Severity::debug,
                             "debug",
-                            "Variable::typeStartToken() of variable '" + var->name() + "' is not located before Variable::typeEndToken(). The location of the typeStartToken() is '" + var->typeStartToken()->str() + "' at line " + MathLib::toString(var->typeStartToken()->linenr()));
+                            "Variable::typeStartToken() of variable '" + var->name() + "' is not located before Variable::typeEndToken(). The location of the typeStartToken() is '" + var->typeStartToken()->str() + "' at line " + std::to_string(var->typeStartToken()->linenr()));
             }
         }
     }
@@ -5861,9 +5861,9 @@ void Tokenizer::dump(std::ostream &out) const
         if (tok->link())
             out << " link=\"" << tok->link() << '\"';
         if (tok->varId() > 0)
-            out << " varId=\"" << MathLib::toString(tok->varId()) << '\"';
+            out << " varId=\"" << tok->varId() << '\"';
         if (tok->exprId() > 0)
-            out << " exprId=\"" << MathLib::toString(tok->exprId()) << '\"';
+            out << " exprId=\"" << tok->exprId() << '\"';
         if (tok->variable())
             out << " variable=\"" << tok->variable() << '\"';
         if (tok->function())
@@ -8592,14 +8592,14 @@ void Tokenizer::simplifyStructDecl()
         // check for anonymous struct/union
         if (Token::Match(tok, "struct|union {")) {
             if (Token::Match(tok->next()->link(), "} const| *|&| const| %type% ,|;|[|(|{|=")) {
-                tok->insertToken("Anonymous" + MathLib::toString(count++));
+                tok->insertToken("Anonymous" + std::to_string(count++));
             }
         }
         // check for derived anonymous class/struct
         else if (cpp && Token::Match(tok, "class|struct :")) {
             const Token *tok1 = Token::findsimplematch(tok, "{");
             if (tok1 && Token::Match(tok1->link(), "} const| *|&| const| %type% ,|;|[|(|{")) {
-                tok->insertToken("Anonymous" + MathLib::toString(count++));
+                tok->insertToken("Anonymous" + std::to_string(count++));
             }
         }
         // check for anonymous enum
@@ -8612,7 +8612,7 @@ void Tokenizer::simplifyStructDecl()
                 start->next()->link()->deleteThis();
                 start->next()->deleteThis();
             }
-            tok->insertToken("Anonymous" + MathLib::toString(count++));
+            tok->insertToken("Anonymous" + std::to_string(count++));
         }
     }
 
@@ -9850,7 +9850,7 @@ void Tokenizer::simplifyOperatorName()
             tok->insertToken("(");
             str->insertToken(")");
             Token::createMutualLinks(tok->next(), str->next());
-            str->insertToken(MathLib::toString(Token::getStrLength(str)));
+            str->insertToken(std::to_string(Token::getStrLength(str)));
             str->insertToken(",");
         }
     }
@@ -10139,7 +10139,7 @@ void Tokenizer::reportError(const std::list<const Token*>& callstack, Severity::
     if (mErrorLogger)
         mErrorLogger->reportErr(errmsg);
     else
-        Check::reportError(errmsg);
+        Check::writeToErrorList(errmsg);
 }
 
 void Tokenizer::setPodTypes()
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
index 31077d831f5..34dbc2e0ec5 100644
--- a/lib/tokenlist.cpp
+++ b/lib/tokenlist.cpp
@@ -385,9 +385,9 @@ std::size_t TokenList::calculateHash() const
 {
     std::string hashData;
     for (const Token* tok = front(); tok; tok = tok->next()) {
-        hashData += MathLib::toString(tok->flags());
-        hashData += MathLib::toString(tok->varId());
-        hashData += MathLib::toString(tok->tokType());
+        hashData += std::to_string(tok->flags());
+        hashData += std::to_string(tok->varId());
+        hashData += std::to_string(tok->tokType());
         hashData += tok->str();
         hashData += tok->originalName();
     }
@@ -912,7 +912,7 @@ static void compilePrecedence2(Token *&tok, AST_state& state)
             }
             compileBinOp(tok, state, compileScope);
         } else if (tok->str() == "[") {
-            if (state.cpp && isPrefixUnary(tok, state.cpp) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
+            if (state.cpp && isPrefixUnary(tok, /*cpp*/ true) && Token::Match(tok->link(), "] (|{|<")) { // Lambda
                 // What we do here:
                 // - Nest the round bracket under the square bracket.
                 // - Nest what follows the lambda (if anything) with the lambda opening [
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index b1e7e52a202..ffd9c209517 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -132,7 +132,7 @@ static void bailoutInternal(const std::string& type, TokenList &tokenlist, Error
         function = "(valueFlow)";
     std::list<ErrorMessage::FileLocation> callstack(1, ErrorMessage::FileLocation(tok, &tokenlist));
     ErrorMessage errmsg(callstack, tokenlist.getSourceFilePath(), Severity::debug,
-                        Path::stripDirectoryPart(file) + ":" + MathLib::toString(line) + ":" + function + " bailout: " + what, type, Certainty::normal);
+                        Path::stripDirectoryPart(file) + ":" + std::to_string(line) + ":" + function + " bailout: " + what, type, Certainty::normal);
     errorLogger->reportErr(errmsg);
 }
 
@@ -169,7 +169,7 @@ static void setSourceLocation(ValueFlow::Value& v,
     std::string file = ctx.file_name();
     if (file.empty())
         return;
-    std::string s = Path::stripDirectoryPart(file) + ":" + MathLib::toString(ctx.line()) + ": " + ctx.function_name() +
+    std::string s = Path::stripDirectoryPart(file) + ":" + std::to_string(ctx.line()) + ": " + ctx.function_name() +
                     " => " + local.function_name() + ": " + debugString(v);
     v.debugPath.emplace_back(tok, std::move(s));
 }
@@ -641,9 +641,10 @@ static void setTokenValue(Token* tok,
         }
     }
 
-    if (Token::simpleMatch(parent, "=") && astIsRHS(tok) && !value.isLifetimeValue()) {
-        setTokenValue(parent, std::move(value), settings);
-        return;
+    if (Token::simpleMatch(parent, "=") && astIsRHS(tok)) {
+        setTokenValue(parent, value, settings);
+        if (!value.isUninitValue())
+            return;
     }
 
     if (value.isContainerSizeValue() && astIsContainer(tok)) {
@@ -696,7 +697,11 @@ static void setTokenValue(Token* tok,
             if (value.isImpossible()) {
                 if (value.intvalue == 0)
                     v.setKnown();
-                else
+                else if ((value.bound == ValueFlow::Value::Bound::Upper && value.intvalue > 0) ||
+                         (value.bound == ValueFlow::Value::Bound::Lower && value.intvalue < 0)) {
+                    v.intvalue = 0;
+                    v.setKnown();
+                } else
                     v.setPossible();
             } else {
                 v.intvalue = !v.intvalue;
@@ -755,7 +760,7 @@ static void setTokenValue(Token* tok,
         if (contains({ValueFlow::Value::ValueType::INT, ValueFlow::Value::ValueType::SYMBOLIC}, value.valueType) &&
             Token::simpleMatch(parent->astOperand1(), "dynamic_cast"))
             return;
-        const ValueType &valueType = ValueType::parseDecl(castType, *settings, true); // TODO: set isCpp
+        const ValueType &valueType = ValueType::parseDecl(castType, *settings);
         if (value.isImpossible() && value.isIntValue() && value.intvalue < 0 && astIsUnsigned(tok) &&
             valueType.sign == ValueType::SIGNED && tok->valueType() &&
             ValueFlow::getSizeOf(*tok->valueType(), settings) >= ValueFlow::getSizeOf(valueType, settings))
@@ -1090,7 +1095,7 @@ static void setTokenValueCast(Token *parent, const ValueType &valueType, const V
 
 static nonneg int getSizeOfType(const Token *typeTok, const Settings *settings)
 {
-    const ValueType &valueType = ValueType::parseDecl(typeTok, *settings, true); // TODO: set isCpp
+    const ValueType &valueType = ValueType::parseDecl(typeTok, *settings);
 
     return ValueFlow::getSizeOf(valueType, settings);
 }
@@ -1293,7 +1298,7 @@ static Token * valueFlowSetConstantValue(Token *tok, const Settings *settings, b
                 setTokenValue(tok->next(), std::move(value), settings);
             }
         } else if (!tok2->type()) {
-            const ValueType& vt = ValueType::parseDecl(tok2, *settings, true); // TODO: set isCpp
+            const ValueType& vt = ValueType::parseDecl(tok2, *settings);
             size_t sz = ValueFlow::getSizeOf(vt, settings);
             const Token* brac = tok2->astParent();
             while (Token::simpleMatch(brac, "[")) {
@@ -2429,6 +2434,20 @@ struct ValueFlowAnalyzer : Analyzer {
         return settings;
     }
 
+    // Returns Action::Match if its an exact match, return Action::Read if it partially matches the lifetime
+    Action analyzeLifetime(const Token* tok) const
+    {
+        if (!tok)
+            return Action::None;
+        if (match(tok))
+            return Action::Match;
+        if (Token::simpleMatch(tok, ".") && analyzeLifetime(tok->astOperand1()) != Action::None)
+            return Action::Read;
+        if (astIsRHS(tok) && Token::simpleMatch(tok->astParent(), "."))
+            return analyzeLifetime(tok->astParent());
+        return Action::None;
+    }
+
     struct ConditionState {
         bool dependent = true;
         bool unknown = true;
@@ -2802,7 +2821,10 @@ struct ValueFlowAnalyzer : Analyzer {
                     return Action::None;
                 lifeTok = v.tokvalue;
             }
-            if (lifeTok && match(lifeTok)) {
+            if (!lifeTok)
+                return Action::None;
+            Action la = analyzeLifetime(lifeTok);
+            if (la.matches()) {
                 Action a = Action::Read;
                 if (isModified(tok).isModified())
                     a = Action::Invalid;
@@ -2812,6 +2834,9 @@ struct ValueFlowAnalyzer : Analyzer {
                     return Action::Inconclusive;
                 return a;
             }
+            if (la.isRead()) {
+                return isAliasModified(tok);
+            }
             return Action::None;
 
         } else if (isAlias(ref, inconclusive)) {
@@ -3295,12 +3320,6 @@ struct MemberExpressionAnalyzer : SubExpressionAnalyzer {
         : SubExpressionAnalyzer(e, std::move(val), t, s), varname(std::move(varname))
     {}
 
-    bool match(const Token* tok) const override
-    {
-        return SubExpressionAnalyzer::match(tok) ||
-               (Token::simpleMatch(tok->astParent(), ".") && SubExpressionAnalyzer::match(tok->astParent()));
-    }
-
     bool submatch(const Token* tok, bool exact) const override
     {
         if (!Token::Match(tok, ". %var%"))
@@ -3330,6 +3349,8 @@ static std::string lifetimeType(const Token *tok, const ValueFlow::Value *val)
     case ValueFlow::Value::LifetimeKind::Address:
         if (astIsPointer(tok))
             result = "pointer";
+        else if (Token::simpleMatch(tok, "=") && astIsPointer(tok->astOperand2()))
+            result = "pointer";
         else
             result = "object";
         break;
@@ -4235,28 +4256,32 @@ struct LifetimeStore {
     }
 };
 
-static bool isOwningVariables(const std::list<Variable>& vars, int depth = 10)
+static bool hasBorrowingVariables(const std::list<Variable>& vars, const std::vector<const Token*>& args, int depth = 10)
 {
     if (depth < 0)
-        return false;
-    return vars.empty() || std::all_of(vars.cbegin(), vars.cend(), [&](const Variable& var) {
-        if (var.isReference() || var.isPointer())
-            return false;
-        const ValueType* vt = var.valueType();
-        if (vt) {
-            if (vt->pointer > 0)
+        return true;
+    return std::any_of(vars.cbegin(), vars.cend(), [&](const Variable& var) {
+        if (const ValueType* vt = var.valueType()) {
+            if (vt->pointer > 0 &&
+                std::none_of(args.begin(), args.end(), [vt](const Token* arg) {
+                return arg->valueType() && arg->valueType()->type == vt->type;
+            }))
                 return false;
-            if (vt->isPrimitive())
+            if (vt->pointer > 0)
                 return true;
-            if (vt->isEnum())
+            if (vt->reference != Reference::None)
                 return true;
+            if (vt->isPrimitive())
+                return false;
+            if (vt->isEnum())
+                return false;
             // TODO: Check container inner type
             if (vt->type == ValueType::CONTAINER && vt->container)
-                return !vt->container->view;
+                return vt->container->view;
             if (vt->typeScope)
-                return isOwningVariables(vt->typeScope->varlist, depth - 1);
+                return hasBorrowingVariables(vt->typeScope->varlist, args, depth - 1);
         }
-        return false;
+        return true;
     });
 }
 
@@ -4333,7 +4358,7 @@ static void valueFlowLifetimeUserConstructor(Token* tok,
             else
                 ls.byVal(tok, tokenlist, errorLogger, settings);
         });
-    } else if (!isOwningVariables(constructor->nestedIn->varlist)) {
+    } else if (hasBorrowingVariables(constructor->nestedIn->varlist, args)) {
         LifetimeStore::forEach(args,
                                "Passed to constructor of '" + name + "'.",
                                ValueFlow::Value::LifetimeKind::SubObject,
@@ -4740,7 +4765,7 @@ static bool isContainerOfPointers(const Token* tok, const Settings* settings)
         return true;
     }
 
-    ValueType vt = ValueType::parseDecl(tok, *settings, true); // TODO: set isCpp
+    ValueType vt = ValueType::parseDecl(tok, *settings);
     return vt.pointer > 0;
 }
 
@@ -5448,6 +5473,8 @@ static void valueFlowSymbolicOperators(const SymbolDatabase& symboldatabase, con
                 const Token* arg = tok->next()->astOperand2();
                 if (!arg)
                     continue;
+                if (arg->exprId() == 0)
+                    continue;
                 ValueFlow::Value c = inferCondition(">=", arg, 0);
                 if (!c.isKnown())
                     continue;
@@ -6648,7 +6675,7 @@ struct ConditionHandler {
             }
         });
     }
-    virtual ~ConditionHandler() {}
+    virtual ~ConditionHandler() = default;
     ConditionHandler(const ConditionHandler&) = default;
 protected:
     ConditionHandler() = default;
@@ -7585,7 +7612,7 @@ static void valueFlowSubFunction(TokenList& tokenlist, SymbolDatabase& symboldat
 
                 // Error path..
                 for (ValueFlow::Value &v : argvalues) {
-                    const std::string nr = MathLib::toString(argnr + 1) + getOrdinalText(argnr + 1);
+                    const std::string nr = std::to_string(argnr + 1) + getOrdinalText(argnr + 1);
 
                     v.errorPath.emplace_back(argtok,
                                              "Calling function '" +
@@ -7971,7 +7998,6 @@ static void valueFlowUninit(TokenList& tokenlist, const Settings* settings)
         Token* start = findStartToken(var, tok->next(), &settings->library);
 
         std::map<Token*, ValueFlow::Value> partialReads;
-        Analyzer::Result result;
         if (const Scope* scope = var->typeScope()) {
             if (Token::findsimplematch(scope->bodyStart, "union", scope->bodyEnd))
                 continue;
@@ -7986,7 +8012,7 @@ static void valueFlowUninit(TokenList& tokenlist, const Settings* settings)
                     continue;
                 }
                 MemberExpressionAnalyzer analyzer(memVar.nameToken()->str(), tok, uninitValue, tokenlist, settings);
-                result = valueFlowGenericForward(start, tok->scope()->bodyEnd, analyzer, *settings);
+                valueFlowGenericForward(start, tok->scope()->bodyEnd, analyzer, *settings);
 
                 for (auto&& p : *analyzer.partialReads) {
                     Token* tok2 = p.first;
@@ -8016,8 +8042,7 @@ static void valueFlowUninit(TokenList& tokenlist, const Settings* settings)
         if (partial)
             continue;
 
-        if (result.terminate != Analyzer::Terminate::Modified)
-            valueFlowForward(start, tok->scope()->bodyEnd, var->nameToken(), uninitValue, tokenlist, settings);
+        valueFlowForward(start, tok->scope()->bodyEnd, var->nameToken(), uninitValue, tokenlist, settings);
     }
 }
 
@@ -8603,7 +8628,7 @@ static bool valueFlowIsSameContainerType(const ValueType& contType, const Token*
     if (!tok || !tok->valueType() || !tok->valueType()->containerTypeToken)
         return false;
 
-    const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, *settings, true);
+    const ValueType tokType = ValueType::parseDecl(tok->valueType()->containerTypeToken, *settings);
     return contType.isTypeEqual(&tokType);
 }
 
@@ -8623,7 +8648,7 @@ static std::vector<ValueFlow::Value> getInitListSize(const Token* tok,
         if (valueType->container->stdStringLike) {
             initList = astIsGenericChar(args[0]) && !astIsPointer(args[0]);
         } else if (containerTypeToken && settings) {
-            ValueType vt = ValueType::parseDecl(containerTypeToken, *settings, true); // TODO: set isCpp
+            ValueType vt = ValueType::parseDecl(containerTypeToken, *settings);
             if (vt.pointer > 0 && astIsPointer(args[0]))
                 initList = true;
             else if (vt.type == ValueType::ITERATOR && astIsIterator(args[0]))
@@ -8658,6 +8683,9 @@ static void valueFlowContainerSetTokValue(TokenList& tokenlist, const Settings*
     ValueFlow::Value value;
     value.valueType = ValueFlow::Value::ValueType::TOK;
     value.tokvalue = initList;
+    if (astIsContainerString(tok) && Token::simpleMatch(initList, "{") && Token::Match(initList->astOperand2(), "%str%")) {
+        value.tokvalue = initList->astOperand2();
+    }
     value.setKnown();
     Token* start = initList->link() ? initList->link() : initList->next();
     if (tok->variable() && tok->variable()->isConst()) {
@@ -8673,6 +8701,19 @@ static const Scope* getFunctionScope(const Scope* scope) {
     return scope;
 }
 
+static MathLib::bigint valueFlowGetStrLength(const Token* tok)
+{
+    if (tok->tokType() == Token::eString)
+        return Token::getStrLength(tok);
+    if (astIsGenericChar(tok) || tok->tokType() == Token::eChar)
+        return 1;
+    if (const ValueFlow::Value* v2 = tok->getKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE))
+        return v2->intvalue;
+    if (const ValueFlow::Value* v1 = tok->getKnownValue(ValueFlow::Value::ValueType::TOK))
+        return valueFlowGetStrLength(v1->tokvalue);
+    return 0;
+}
+
 static void valueFlowContainerSize(TokenList& tokenlist,
                                    const SymbolDatabase& symboldatabase,
                                    ErrorLogger* /*errorLogger*/,
@@ -8817,21 +8858,12 @@ static void valueFlowContainerSize(TokenList& tokenlist,
             } else if (Token::simpleMatch(tok, "+=") && astIsContainer(tok->astOperand1())) {
                 const Token* containerTok = tok->astOperand1();
                 const Token* valueTok = tok->astOperand2();
-                MathLib::bigint size = 0;
-                if (valueTok->tokType() == Token::eString)
-                    size = Token::getStrLength(valueTok);
-                else if (astIsGenericChar(tok) || valueTok->tokType() == Token::eChar)
-                    size = 1;
-                else if (const ValueFlow::Value* v1 = valueTok->getKnownValue(ValueFlow::Value::ValueType::TOK))
-                    size = Token::getStrLength(v1->tokvalue);
-                else if (const ValueFlow::Value* v2 =
-                             valueTok->getKnownValue(ValueFlow::Value::ValueType::CONTAINER_SIZE))
-                    size = v2->intvalue;
+                MathLib::bigint size = valueFlowGetStrLength(valueTok);
                 if (size == 0)
                     continue;
                 ValueFlow::Value value(size - 1);
                 value.valueType = ValueFlow::Value::ValueType::CONTAINER_SIZE;
-                value.bound = ValueFlow::Value::Bound::Lower;
+                value.bound = ValueFlow::Value::Bound::Upper;
                 value.setImpossible();
                 Token* next = nextAfterAstRightmostLeaf(tok);
                 if (!next)
@@ -9005,7 +9037,7 @@ static void valueFlowDynamicBufferSize(const TokenList& tokenlist, const SymbolD
                 continue;
 
             ValueFlow::Value value(sizeValue);
-            value.errorPath.emplace_back(tok->tokAt(2), "Assign " + tok->strAt(1) + ", buffer with size " + MathLib::toString(sizeValue));
+            value.errorPath.emplace_back(tok->tokAt(2), "Assign " + tok->strAt(1) + ", buffer with size " + std::to_string(sizeValue));
             value.valueType = ValueFlow::Value::ValueType::BUFFER_SIZE;
             value.setKnown();
             valueFlowForward(const_cast<Token*>(rhs), functionScope->bodyEnd, tok->next(), std::move(value), tokenlist, settings);
@@ -9076,7 +9108,7 @@ static bool getMinMaxValues(const std::string &typestr, const Settings *settings
         return false;
     typeTokens.simplifyPlatformTypes();
     typeTokens.simplifyStdType();
-    const ValueType &vt = ValueType::parseDecl(typeTokens.front(), *settings, true); // TODO: set isCpp
+    const ValueType &vt = ValueType::parseDecl(typeTokens.front(), *settings);
     return getMinMaxValues(&vt, settings->platform, minvalue, maxvalue);
 }
 
@@ -9156,12 +9188,12 @@ static void valueFlowSafeFunctions(TokenList& tokenlist, const SymbolDatabase& s
             std::list<ValueFlow::Value> argValues;
             if (isLow) {
                 argValues.emplace_back(low);
-                argValues.back().errorPath.emplace_back(arg.nameToken(), std::string(safeLow ? "Safe checks: " : "") + "Assuming argument has value " + MathLib::toString(low));
+                argValues.back().errorPath.emplace_back(arg.nameToken(), std::string(safeLow ? "Safe checks: " : "") + "Assuming argument has value " + std::to_string(low));
                 argValues.back().safe = safeLow;
             }
             if (isHigh) {
                 argValues.emplace_back(high);
-                argValues.back().errorPath.emplace_back(arg.nameToken(), std::string(safeHigh ? "Safe checks: " : "") + "Assuming argument has value " + MathLib::toString(high));
+                argValues.back().errorPath.emplace_back(arg.nameToken(), std::string(safeHigh ? "Safe checks: " : "") + "Assuming argument has value " + std::to_string(high));
                 argValues.back().safe = safeHigh;
             }
 
@@ -9258,7 +9290,7 @@ struct ValueFlowPass {
     virtual void run(const ValueFlowState& state) const = 0;
     // Returns true if pass needs C++
     virtual bool cpp() const = 0;
-    virtual ~ValueFlowPass() noexcept {}
+    virtual ~ValueFlowPass() noexcept = default;
 };
 
 struct ValueFlowPassRunner {
diff --git a/lib/valueptr.h b/lib/valueptr.h
index 0740a72fc10..3bb3f71e260 100644
--- a/lib/valueptr.h
+++ b/lib/valueptr.h
@@ -97,7 +97,6 @@ class CPPCHECKLIB ValuePtr {
     operator bool() const NOEXCEPT {
         return !!mPtr;
     }
-    ~ValuePtr() {}
 
 private:
     std::shared_ptr<T> mPtr;
diff --git a/lib/vfvalue.cpp b/lib/vfvalue.cpp
index 6a1ba6f3b9d..c99a76dd305 100644
--- a/lib/vfvalue.cpp
+++ b/lib/vfvalue.cpp
@@ -96,7 +96,7 @@ namespace ValueFlow {
     std::string Value::infoString() const {
         switch (valueType) {
         case ValueType::INT:
-            return MathLib::toString(intvalue);
+            return std::to_string(intvalue);
         case ValueType::TOK:
             return tokvalue->str();
         case ValueType::FLOAT:
@@ -107,19 +107,19 @@ namespace ValueFlow {
             return "<Uninit>";
         case ValueType::BUFFER_SIZE:
         case ValueType::CONTAINER_SIZE:
-            return "size=" + MathLib::toString(intvalue);
+            return "size=" + std::to_string(intvalue);
         case ValueType::ITERATOR_START:
-            return "start=" + MathLib::toString(intvalue);
+            return "start=" + std::to_string(intvalue);
         case ValueType::ITERATOR_END:
-            return "end=" + MathLib::toString(intvalue);
+            return "end=" + std::to_string(intvalue);
         case ValueType::LIFETIME:
             return "lifetime=" + tokvalue->str();
         case ValueType::SYMBOLIC:
             std::string result = "symbolic=" + tokvalue->expressionString();
             if (intvalue > 0)
-                result += "+" + MathLib::toString(intvalue);
+                result += "+" + std::to_string(intvalue);
             else if (intvalue < 0)
-                result += "-" + MathLib::toString(-intvalue);
+                result += "-" + std::to_string(-intvalue);
             return result;
         }
         throw InternalError(nullptr, "Invalid ValueFlow Value type");
diff --git a/releasenotes.txt b/releasenotes.txt
index b535a56c4b0..57e6d0210fa 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,4 @@
-release notes for cppcheck-2.12
+Release Notes for Cppcheck 2.12
 
 New checks:
 - uselessOverride finds overriding functions that either duplicate code from or delegate back to the base class implementation
@@ -14,6 +14,8 @@ Changed interface:
 
 Deprecations:
 - The qmake build system has been deprecated and will be removed in a future version.
+- Command-line option '--template <template>' is deprecated and will be removed in 2.13 - please use '--template=<template>' instead.
+- Command-line option '--template-location <template>' is deprecated and will be removed in 2.13 - please use '--template-location=<template>' instead.
 
 Other:
 - "USE_QT6=On" will no longer fallback to Qt5 when Qt6 is not found.
diff --git a/test/fixture.cpp b/test/fixture.cpp
index e332fbf7aaf..1eb9d5936a5 100644
--- a/test/fixture.cpp
+++ b/test/fixture.cpp
@@ -91,6 +91,8 @@ bool TestFixture::prepareTest(const char testname[])
     mTemplateFormat.clear();
     mTemplateLocation.clear();
 
+    prepareTestInternal();
+
     // Check if tests should be executed
     if (testToRun.empty() || testToRun == testname) {
         // Tests will be executed - prepare them
diff --git a/test/fixture.h b/test/fixture.h
index a09a193f0e6..050e7c91e11 100644
--- a/test/fixture.h
+++ b/test/fixture.h
@@ -60,6 +60,7 @@ class TestFixture : public ErrorLogger {
     virtual void run() = 0;
 
     bool prepareTest(const char testname[]);
+    virtual void prepareTestInternal() {}
     std::string getLocationStr(const char * const filename, const unsigned int linenr) const;
 
     bool assert_(const char * const filename, const unsigned int linenr, const bool condition) const;
@@ -124,10 +125,10 @@ class TestFixture : public ErrorLogger {
     }
 
     template<typename T>
-    static void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
+    static void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     {
         T& check = getCheck<T>();
-        check.runChecks(tokenizer, settings, errorLogger);
+        check.runChecks(tokenizer, errorLogger);
     }
 
     class SettingsBuilder
@@ -240,7 +241,6 @@ class TestFixture : public ErrorLogger {
     const std::string classname;
 
     explicit TestFixture(const char * const _name);
-    ~TestFixture() override {}
 
     static std::size_t runTests(const options& args);
 };
diff --git a/test/testassert.cpp b/test/testassert.cpp
index 491d9a183ca..589b5364123 100644
--- a/test/testassert.cpp
+++ b/test/testassert.cpp
@@ -44,7 +44,7 @@ class TestAssert : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check..
-        runChecks<CheckAssert>(&tokenizer, &settings, this);
+        runChecks<CheckAssert>(tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
index 0ee1d84132a..aed96118ca5 100644
--- a/test/testautovariables.cpp
+++ b/test/testautovariables.cpp
@@ -44,7 +44,7 @@ class TestAutoVariables : public TestFixture {
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
-        runChecks<CheckAutoVariables>(&tokenizer, &settings1, this);
+        runChecks<CheckAutoVariables>(tokenizer, this);
     }
 
     void run() override {
@@ -3647,6 +3647,19 @@ class TestAutoVariables : public TestFixture {
               "}\n",
               true);
         ASSERT_EQUALS("", errout.str());
+
+        check("struct S {\n"
+              "    explicit S(const char* p) { m = p; }\n"
+              "    void g();\n"
+              "    std::string m;\n"
+              "    int* t{};\n"
+              "};\n"
+              "void f(const std::stringstream& buffer) {\n"
+              "    S s(buffer.str().c_str());\n"
+              "    s.g();\n"
+              "}\n",
+              true);
+        ASSERT_EQUALS("", errout.str());
     }
 
     void danglingLifetimeAggegrateConstructor() {
diff --git a/test/testbool.cpp b/test/testbool.cpp
index 3f311183d2d..17115bd9e50 100644
--- a/test/testbool.cpp
+++ b/test/testbool.cpp
@@ -87,7 +87,7 @@ class TestBool : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check...
-        runChecks<CheckBool>(&tokenizer, &settings, this);
+        runChecks<CheckBool>(tokenizer, this);
     }
 
 
diff --git a/test/testboost.cpp b/test/testboost.cpp
index 39dfeff4100..fd6d8ef4b6a 100644
--- a/test/testboost.cpp
+++ b/test/testboost.cpp
@@ -47,7 +47,7 @@ class TestBoost : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        runChecks<CheckBoost>(&tokenizer, &settings, this);
+        runChecks<CheckBoost>(tokenizer, this);
     }
 
     void BoostForeachContainerModification() {
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 862add41981..b5361335b59 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -56,7 +56,7 @@ class TestBufferOverrun : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
     void check_(const char* file, int line, const char code[], const Settings &settings, const char filename[] = "test.cpp") {
@@ -68,7 +68,7 @@ class TestBufferOverrun : public TestFixture {
         errout.str("");
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
     void checkP(const char code[], const char* filename = "test.cpp")
@@ -95,7 +95,7 @@ class TestBufferOverrun : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(&tokenizer, &settings, this);
+        runChecks<CheckBufferOverrun>(tokenizer, this);
     }
 
     void run() override {
@@ -190,6 +190,7 @@ class TestBufferOverrun : public TestFixture {
         TEST_CASE(array_index_negative7);    // #5685
         TEST_CASE(array_index_negative8);    // #11651
         TEST_CASE(array_index_negative9);
+        TEST_CASE(array_index_negative10);
         TEST_CASE(array_index_for_decr);
         TEST_CASE(array_index_varnames);     // FP: struct member #1576, FN: #1586
         TEST_CASE(array_index_for_continue); // for,continue
@@ -2336,6 +2337,20 @@ class TestBufferOverrun : public TestFixture {
         ASSERT_EQUALS("[test.cpp:8]: (error) Array 'a[3]' accessed at index -1, which is out of bounds.\n", errout.str());
     }
 
+    // #11844
+    void array_index_negative10()
+    {
+        check("struct S { int a[4]; };\n"
+              "void f(S* p, int k) {\n"
+              "  int m = 3;\n"
+              "  if (k)\n"
+              "    m = 2;\n"
+              "  for (int j = m + 1; j <= 4; j++)\n"
+              "    p->a[j-1];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void array_index_for_decr() {
         check("void f()\n"
               "{\n"
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 455f1e50c6c..54e844f899d 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "cppcheckexecutor.h"
 #include "errortypes.h"
+#include "helpers.h"
 #include "platform.h"
 #include "redirect.h"
 #include "settings.h"
@@ -51,8 +52,13 @@ class TestCmdlineParser : public TestFixture {
     }
 
 private:
-    Settings settings; // TODO: reset after each test
-    CmdLineParser defParser{settings, settings.nomsg, settings.nofail}; // TODO: reset after each test
+    std::unique_ptr<Settings> settings;
+    std::unique_ptr<CmdLineParser> parser;
+
+    void prepareTestInternal() override {
+        settings.reset(new Settings());
+        parser.reset(new CmdLineParser(*settings, settings->nomsg, settings->nofail));
+    }
 
     void run() override {
         TEST_CASE(nooptions);
@@ -68,7 +74,10 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(debugwarnings);
         TEST_CASE(forceshort);
         TEST_CASE(forcelong);
-        TEST_CASE(relativePaths);
+        TEST_CASE(relativePaths1);
+        TEST_CASE(relativePaths2);
+        TEST_CASE(relativePaths3);
+        TEST_CASE(relativePaths4);
         TEST_CASE(quietshort);
         TEST_CASE(quietlong);
         TEST_CASE(defines_noarg);
@@ -78,7 +87,13 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(defines2);
         TEST_CASE(defines3);
         TEST_CASE(defines4);
-        TEST_CASE(enforceLanguage);
+        TEST_CASE(enforceLanguage1);
+        TEST_CASE(enforceLanguage2);
+        TEST_CASE(enforceLanguage3);
+        TEST_CASE(enforceLanguage4);
+        TEST_CASE(enforceLanguage5);
+        TEST_CASE(enforceLanguage6);
+        TEST_CASE(enforceLanguage7);
         TEST_CASE(includesnopath);
         TEST_CASE(includes);
         TEST_CASE(includesslash);
@@ -127,6 +142,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(jobs2);
         TEST_CASE(jobsMissingCount);
         TEST_CASE(jobsInvalid);
+        TEST_CASE(jobsNoJobs);
         TEST_CASE(jobsTooBig);
         TEST_CASE(maxConfigs);
         TEST_CASE(maxConfigsMissingCount);
@@ -135,7 +151,8 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(reportProgressTest); // "Test" suffix to avoid hiding the parent's reportProgress
         TEST_CASE(stdc99);
         TEST_CASE(stdcpp11);
-        TEST_CASE(stdunknown);
+        TEST_CASE(stdunknown1);
+        TEST_CASE(stdunknown2);
         TEST_CASE(platformWin64);
         TEST_CASE(platformWin32A);
         TEST_CASE(platformWin32W);
@@ -155,7 +172,9 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(plistDoesNotExist);
         TEST_CASE(suppressionsOld);
         TEST_CASE(suppressions);
-        TEST_CASE(suppressionsNoFile);
+        TEST_CASE(suppressionsNoFile1);
+        TEST_CASE(suppressionsNoFile2);
+        TEST_CASE(suppressionsNoFile3);
         TEST_CASE(suppressionSingle);
         TEST_CASE(suppressionSingleFile);
         TEST_CASE(suppressionTwo);
@@ -247,179 +266,175 @@ class TestCmdlineParser : public TestFixture {
     void nooptions() {
         REDIRECT;
         const char * const argv[] = {"cppcheck"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(1, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
+        ASSERT(parser->parseFromArgs(1, argv));
+        ASSERT_EQUALS(true, parser->getShowHelp());
         ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
     }
 
     void helpshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-h"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(true, parser->getShowHelp());
         ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
     }
 
     void helplong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--help"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowHelp());
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(true, parser->getShowHelp());
         ASSERT(GET_REDIRECT_OUTPUT.find("Cppcheck - A tool for static C/C++ code analysis") == 0);
     }
 
     void showversion() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--version"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, parser.getShowVersion());
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(true, parser->getShowVersion());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT); // version is not actually shown
     }
 
     void onefile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(1, (int)parser.getPathNames().size());
-        ASSERT_EQUALS("file.cpp", parser.getPathNames().at(0));
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(1, (int)parser->getPathNames().size());
+        ASSERT_EQUALS("file.cpp", parser->getPathNames().at(0));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void onepath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "src"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(1, (int)parser.getPathNames().size());
-        ASSERT_EQUALS("src", parser.getPathNames().at(0));
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(1, (int)parser->getPathNames().size());
+        ASSERT_EQUALS("src", parser->getPathNames().at(0));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void optionwithoutfile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-v"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(0, (int)parser.getPathNames().size());
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(0, (int)parser->getPathNames().size());
         ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT);
     }
 
     void verboseshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-v", "file.cpp"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.verbose);
+        settings->verbose = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->verbose);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void verboselong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--verbose", "file.cpp"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.verbose);
+        settings->verbose = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->verbose);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void debugSimplified() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-simplified", "file.cpp"};
-        settings.debugSimplified = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.debugSimplified);
+        settings->debugSimplified = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->debugSimplified);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void debugwarnings() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--debug-warnings", "file.cpp"};
-        settings.debugwarnings = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.debugwarnings);
+        settings->debugwarnings = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->debugwarnings);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void forceshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-f", "file.cpp"};
-        settings.force = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.force);
+        settings->force = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->force);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void forcelong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--force", "file.cpp"};
-        settings.force = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.force);
+        settings->force = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->force);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
-    void relativePaths() {
+    void relativePaths1() {
         REDIRECT;
-        settings.relativePaths = false;
-
-        const char * const argvs[] = {"cppcheck", "-rp", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvs));
-        ASSERT_EQUALS(true, settings.relativePaths);
+        settings->relativePaths = false;
+        const char * const argv[] = {"cppcheck", "-rp", "file.cpp"};
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-
-        const char * const argvl[] = {"cppcheck", "--relative-paths", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvl));
-        ASSERT_EQUALS(true, settings.relativePaths);
+    void relativePaths2() {
+        REDIRECT;
+        settings->relativePaths = false;
+        const char * const argv[] = {"cppcheck", "--relative-paths", "file.cpp"};
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-        settings.basePaths.clear();
-
-        const char * const argvsp[] = {"cppcheck", "-rp=C:/foo;C:\\bar", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvsp));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS(2, settings.basePaths.size());
-        ASSERT_EQUALS("C:/foo", settings.basePaths[0]);
-        ASSERT_EQUALS("C:/bar", settings.basePaths[1]);
+    void relativePaths3() {
+        REDIRECT;
+        settings->relativePaths = false;
+        settings->basePaths.clear();
+        const char * const argv[] = {"cppcheck", "-rp=C:/foo;C:\\bar", "file.cpp"};
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+        ASSERT_EQUALS(2, settings->basePaths.size());
+        ASSERT_EQUALS("C:/foo", settings->basePaths[0]);
+        ASSERT_EQUALS("C:/bar", settings->basePaths[1]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        settings.relativePaths = false;
-        settings.basePaths.clear();
+    void relativePaths4() {
+        REDIRECT;
+        settings->relativePaths = false;
+        settings->basePaths.clear();
 
-        const char * const argvlp[] = {"cppcheck", "--relative-paths=C:/foo;C:\\bar", "file.cpp"};
-        ASSERT(defParser.parseFromArgs(3, argvlp));
-        ASSERT_EQUALS(true, settings.relativePaths);
-        ASSERT_EQUALS(2, settings.basePaths.size());
-        ASSERT_EQUALS("C:/foo", settings.basePaths[0]);
-        ASSERT_EQUALS("C:/bar", settings.basePaths[1]);
+        const char * const argv[] = {"cppcheck", "--relative-paths=C:/foo;C:\\bar", "file.cpp"};
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->relativePaths);
+        ASSERT_EQUALS(2, settings->basePaths.size());
+        ASSERT_EQUALS("C:/foo", settings->basePaths[0]);
+        ASSERT_EQUALS("C:/bar", settings->basePaths[1]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void quietshort() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-q", "file.cpp"};
-        settings.quiet = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.quiet);
+        settings->quiet = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->quiet);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void quietlong() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--quiet", "file.cpp"};
-        settings.quiet = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.quiet);
+        settings->quiet = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->quiet);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -427,7 +442,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -435,7 +450,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "-v", "file.cpp"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -443,266 +458,274 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "--quiet", "file.cpp"};
         // Fails since -D has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-D' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
     void defines() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D_WIN32", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("_WIN32=1", settings.userDefines);
+        settings->userDefines.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("_WIN32=1", settings->userDefines);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void defines2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D_WIN32", "-DNODEBUG", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings.userDefines);
+        settings->userDefines.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("_WIN32=1;NODEBUG=1", settings->userDefines);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void defines3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-D", "DEBUG", "file.cpp"};
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("DEBUG=1", settings.userDefines);
+        settings->userDefines.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("DEBUG=1", settings->userDefines);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void defines4() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-DDEBUG=", "file.cpp"}; // #5137 - defining empty macro
-        settings.userDefines.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("DEBUG=", settings.userDefines);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-    }
-
-    void enforceLanguage() {
-        REDIRECT;
-        {
-            const char * const argv[] = {"cppcheck", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(2, argv));
-            ASSERT_EQUALS(Settings::Language::None, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(4, argv));
-            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x"};
-            ASSERT(!defParser.parseFromArgs(2, argv));
-            ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "-x", "--inconclusive", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(4, argv));
-            ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::Language::CPP, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
-            settings.enforcedLang = Settings::Language::None;
-            ASSERT(defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(Settings::Language::C, settings.enforcedLang);
-            ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--language=unknownLanguage", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", GET_REDIRECT_OUTPUT);
-        }
+        settings->userDefines.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("DEBUG=", settings->userDefines);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage1() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "file.cpp"};
+        settings->enforcedLang = Settings::Language::None;
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS(Settings::Language::None, settings->enforcedLang);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-x", "c++", "file.cpp"};
+        settings->enforcedLang = Settings::Language::None;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-x"};
+        ASSERT(!parser->parseFromArgs(2, argv));
+        ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage4() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-x", "--inconclusive", "file.cpp"};
+        ASSERT(!parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("cppcheck: error: no language given to '-x' option.\n", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage5() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--language=c++", "file.cpp"};
+        settings->enforcedLang = Settings::Language::None;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(Settings::Language::CPP, settings->enforcedLang);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage6() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--language=c", "file.cpp"};
+        settings->enforcedLang = Settings::Language::None;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(Settings::Language::C, settings->enforcedLang);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void enforceLanguage7() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--language=unknownLanguage", "file.cpp"};
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: unknown language 'unknownLanguage' enforced.\n", GET_REDIRECT_OUTPUT);
     }
 
     void includesnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I"};
         // Fails since -I has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-I' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
     void includes() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
+        settings->includePaths.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void includesslash() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include/", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
+        settings->includePaths.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void includesbackslash() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include\\", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
+        settings->includePaths.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void includesnospace() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-Iinclude", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
+        settings->includePaths.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void includes2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-I", "include/", "-I", "framework/", "file.cpp"};
-        settings.includePaths.clear();
-        ASSERT(defParser.parseFromArgs(6, argv));
-        ASSERT_EQUALS("include/", settings.includePaths.front());
-        settings.includePaths.pop_front();
-        ASSERT_EQUALS("framework/", settings.includePaths.front());
+        settings->includePaths.clear();
+        ASSERT(parser->parseFromArgs(6, argv));
+        ASSERT_EQUALS("include/", settings->includePaths.front());
+        settings->includePaths.pop_front();
+        ASSERT_EQUALS("framework/", settings->includePaths.front());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
-    // TODO: fails since the file is not found
     void includesFile() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ScopedFile file("includes.txt",
+                        "path/sub\n"
+                        "path2/sub1\n");
+        const char * const argv[] = {"cppcheck", "--includes-file=includes.txt", "file.cpp"};
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(2, settings->includePaths.size());
+        auto it = settings->includePaths.cbegin();
+        ASSERT_EQUALS("path/sub/", *it++);
+        ASSERT_EQUALS("path2/sub1/", *it);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void includesFileNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--includes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: unable to open includes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
     }
 
-    // TODO: fails since the file is not found
     void configExcludesFile() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        settings.includePaths.clear();
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        // TODO: add checks
-        TODO_ASSERT_EQUALS("", "cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
+        ScopedFile file("excludes.txt",
+                        "path/sub\n"
+                        "path2/sub1\n");
+        const char * const argv[] = {"cppcheck", "--config-excludes-file=excludes.txt", "file.cpp"};
+        settings->configExcludePaths.clear();
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(2, settings->configExcludePaths.size());
+        auto it = settings->configExcludePaths.cbegin();
+        ASSERT_EQUALS("path/sub/", *it++);
+        ASSERT_EQUALS("path2/sub1/", *it);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void configExcludesFileNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--config-excludes-file=fileThatDoesNotExist.txt", "file.cpp"};
-        ASSERT_EQUALS( false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS( false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: unable to open config excludes file at 'fileThatDoesNotExist.txt'\n", GET_REDIRECT_OUTPUT);
     }
 
     void enabledAll() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=all", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT(!settings.checks.isEnabled(Checks::internalCheck));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT(!settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledStyle() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=style", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::internalCheck));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledPerformance() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=performance", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(!settings.severity.isEnabled(Severity::warning));
-        ASSERT(settings.severity.isEnabled(Severity::performance));
-        ASSERT(!settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(!settings->severity.isEnabled(Severity::warning));
+        ASSERT(settings->severity.isEnabled(Severity::performance));
+        ASSERT(!settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledPortability() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=portability", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(!settings.severity.isEnabled(Severity::warning));
-        ASSERT(!settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(!settings->severity.isEnabled(Severity::warning));
+        ASSERT(!settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledInformation() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=information", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.severity.isEnabled(Severity::information));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT);
     }
 
     void enabledUnusedFunction() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=unusedFunction", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::unusedFunction));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->checks.isEnabled(Checks::unusedFunction));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledMissingInclude() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -710,9 +733,8 @@ class TestCmdlineParser : public TestFixture {
     void enabledInternal() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=internal", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.checks.isEnabled(Checks::internalCheck));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 #endif
@@ -720,155 +742,147 @@ class TestCmdlineParser : public TestFixture {
     void enabledMultiple() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude,portability,warning", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::style));
-        ASSERT(settings.severity.isEnabled(Severity::warning));
-        ASSERT(!settings.severity.isEnabled(Severity::performance));
-        ASSERT(settings.severity.isEnabled(Severity::portability));
-        ASSERT(!settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(!settings->severity.isEnabled(Severity::style));
+        ASSERT(settings->severity.isEnabled(Severity::warning));
+        ASSERT(!settings->severity.isEnabled(Severity::performance));
+        ASSERT(settings->severity.isEnabled(Severity::portability));
+        ASSERT(!settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void enabledInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=warning,missingIncludeSystem,style", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'missingIncludeSystem'\n", GET_REDIRECT_OUTPUT);
     }
 
     void enabledError() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=error", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --enable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT);
     }
 
     void enabledEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --enable parameter is empty\n", GET_REDIRECT_OUTPUT);
     }
 
+
     void disableAll() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=all"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
+        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=all", "file.cpp"};
+        settings->severity.clear();
+        settings->checks.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void disableMultiple() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=style", "--disable=unusedFunction"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(true, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
+        const char * const argv[] = {"cppcheck", "--enable=all", "--disable=style", "--disable=unusedFunction", "file.cpp"};
+        settings->severity.clear();
+        settings->checks.clear();
+        ASSERT(parser->parseFromArgs(5, argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     // make sure the implied "style" checks are not added when "--enable=style" is specified
     void disableStylePartial() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--enable=style", "--disable=performance", "--enable=unusedFunction"};
-        settings.severity.clear();
-        settings.checks.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::error));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::warning));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::style));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::performance));
-        ASSERT_EQUALS(true, settings.severity.isEnabled(Severity::portability));
-        ASSERT_EQUALS(false, settings.severity.isEnabled(Severity::debug));
-        ASSERT_EQUALS(true, settings.checks.isEnabled(Checks::unusedFunction));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::missingInclude));
-        ASSERT_EQUALS(false, settings.checks.isEnabled(Checks::internalCheck));
+        const char * const argv[] = {"cppcheck", "--enable=style", "--disable=performance", "--enable=unusedFunction", "file.cpp"};
+        settings->severity.clear();
+        settings->checks.clear();
+        ASSERT(parser->parseFromArgs(5, argv));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::error));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::warning));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::style));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::performance));
+        ASSERT_EQUALS(true, settings->severity.isEnabled(Severity::portability));
+        ASSERT_EQUALS(false, settings->severity.isEnabled(Severity::debug));
+        ASSERT_EQUALS(true, settings->checks.isEnabled(Checks::unusedFunction));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::missingInclude));
+        ASSERT_EQUALS(false, settings->checks.isEnabled(Checks::internalCheck));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void disableInformationPartial() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=information", "--disable=missingInclude", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.severity.isEnabled(Severity::information));
-        ASSERT(!settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT(settings->severity.isEnabled(Severity::information));
+        ASSERT(!settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("cppcheck: '--enable=information' will no longer implicitly enable 'missingInclude' starting with 2.16. Please enable it explicitly if you require it.\n", GET_REDIRECT_OUTPUT);
     }
 
     void disableInformationPartial2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--enable=missingInclude", "--disable=information", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(!settings.severity.isEnabled(Severity::information));
-        ASSERT(settings.checks.isEnabled(Checks::missingInclude));
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT(!settings->severity.isEnabled(Severity::information));
+        ASSERT(settings->checks.isEnabled(Checks::missingInclude));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void disableInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=leaks", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'leaks'\n", GET_REDIRECT_OUTPUT);
     }
 
     void disableError() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=error", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --disable parameter with the unknown name 'error'\n", GET_REDIRECT_OUTPUT);
     }
 
     void disableEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--disable=", "file.cpp"};
-        settings = Settings();
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: --disable parameter is empty\n", GET_REDIRECT_OUTPUT);
     }
 
     void inconclusive() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--inconclusive"};
-        settings.certainty.clear();
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(true, settings.certainty.isEnabled(Certainty::inconclusive));
+        const char * const argv[] = {"cppcheck", "--inconclusive", "file.cpp"};
+        settings->certainty.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->certainty.isEnabled(Certainty::inconclusive));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void errorExitcode() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=5", "file.cpp"};
-        settings.exitCode = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(5, settings.exitCode);
+        settings->exitCode = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(5, settings->exitCode);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -876,7 +890,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=", "file.cpp"};
         // Fails since exit code not given
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -884,46 +898,57 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--error-exitcode=foo", "file.cpp"};
         // Fails since invalid exit code
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--error-exitcode=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void exitcodeSuppressionsOld() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "suppr.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void exitcodeSuppressions() {
-        // TODO: Fails since cannot open the file
         REDIRECT;
+        ScopedFile file("suppr.txt",
+                        "uninitvar\n"
+                        "unusedFunction\n");
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions=suppr.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(2, settings->nofail.getSuppressions().size());
+        auto it = settings->nofail.getSuppressions().cbegin();
+        ASSERT_EQUALS("uninitvar", (*it++).errorId);
+        ASSERT_EQUALS("unusedFunction", (*it).errorId);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void exitcodeSuppressionsNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exitcode-suppressions", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exitcode-suppressions\".\n", GET_REDIRECT_OUTPUT);
     }
 
-    // TODO: file does not exist
     void fileList() {
         REDIRECT;
+        ScopedFile file("files.txt",
+                        "file1.c\n"
+                        "file2.cpp\n");
         const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        // TODO: settings are not being reset after each test
-        //TODO_ASSERT_EQUALS(4, 1, defParser.getPathNames().size());
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(3, parser->getPathNames().size());
+        auto it = parser->getPathNames().cbegin();
+        ASSERT_EQUALS("file1.c", *it++);
+        ASSERT_EQUALS("file2.cpp", *it++);
+        ASSERT_EQUALS("file.cpp", *it);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void fileListNoFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--file-list=files.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: couldn't open the file: \"files.txt\".\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -932,41 +957,41 @@ class TestCmdlineParser : public TestFixture {
             // files in stdin (_pathnames) is empty
             REDIRECT;
             const char * const argv[] = {"cppcheck", "--file-list=-", "file.cpp"};
-            TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
+            TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv));
             TODO_ASSERT_EQUALS("", "", GET_REDIRECT_OUTPUT);
         } */
 
     void fileListInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--file-list", "files.txt", "file.cpp"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--file-list\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void inlineSuppr() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--inline-suppr", "file.cpp"};
-        settings.inlineSuppressions = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.inlineSuppressions);
+        settings->inlineSuppressions = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->inlineSuppressions);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void jobs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "3", "file.cpp"};
-        settings.jobs = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(3, settings.jobs);
+        settings->jobs = 0;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(3, settings->jobs);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void jobs2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j3", "file.cpp"};
-        settings.jobs = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(3, settings.jobs);
+        settings->jobs = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(3, settings->jobs);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -974,7 +999,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "file.cpp"};
         // Fails since -j is missing thread count
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -982,25 +1007,32 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-j", "e", "file.cpp"};
         // Fails since invalid count given for -j
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-j' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
+    void jobsNoJobs() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "-j0", "file.cpp"};
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: argument for '-j' must be greater than 0.\n", GET_REDIRECT_OUTPUT);
+    }
+
     void jobsTooBig() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "-j10001", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 10000 at max.\n", GET_REDIRECT_OUTPUT);
+        const char * const argv[] = {"cppcheck", "-j1025", "file.cpp"};
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: argument for '-j' is allowed to be 1024 at max.\n", GET_REDIRECT_OUTPUT);
     }
 
     void maxConfigs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-f", "--max-configs=12", "file.cpp"};
-        settings.force = false;
-        settings.maxConfigs = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(12, settings.maxConfigs);
-        ASSERT_EQUALS(false, settings.force);
+        settings->force = false;
+        settings->maxConfigs = 0;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(12, settings->maxConfigs);
+        ASSERT_EQUALS(false, settings->force);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -1008,7 +1040,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=", "file.cpp"};
         // Fails since --max-configs= is missing limit
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1016,7 +1048,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=e", "file.cpp"};
         // Fails since invalid count given for --max-configs=
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1024,146 +1056,145 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-configs=0", "file.cpp"};
         // Fails since limit must be greater than 0
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--max-configs=' must be greater than 0.\n", GET_REDIRECT_OUTPUT);
     }
 
     void reportProgressTest() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--report-progress", "file.cpp"};
-        settings.reportProgress = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.reportProgress);
+        settings->reportProgress = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->reportProgress);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void stdc99() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--std=c99", "file.cpp"};
-        settings.standards.c = Standards::C89;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.standards.c == Standards::C99);
+        settings->standards.c = Standards::C89;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->standards.c == Standards::C99);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void stdcpp11() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--std=c++11", "file.cpp"};
-        settings.standards.cpp = Standards::CPP03;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.standards.cpp == Standards::CPP11);
+        settings->standards.cpp = Standards::CPP03;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->standards.cpp == Standards::CPP11);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
-    void stdunknown() {
+    void stdunknown1() {
         REDIRECT;
-        {
-            const char *const argv[] = {"cppcheck", "--std=d++11", "file.cpp"};
-            ASSERT(!defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", GET_REDIRECT_OUTPUT);
-        }
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char *const argv[] = {"cppcheck", "--std=cplusplus11", "file.cpp"};
-            TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-            TODO_ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", "", GET_REDIRECT_OUTPUT);
-        }
+        const char *const argv[] = {"cppcheck", "--std=d++11", "file.cpp"};
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("cppcheck: error: unknown --std value 'd++11'\n", GET_REDIRECT_OUTPUT);
+    }
+
+    void stdunknown2() {
+        REDIRECT;
+        const char *const argv[] = {"cppcheck", "--std=cplusplus11", "file.cpp"};
+        TODO_ASSERT(!parser->parseFromArgs(3, argv));
+        TODO_ASSERT_EQUALS("cppcheck: error: unknown --std value 'cplusplus11'\n", "", GET_REDIRECT_OUTPUT);
     }
 
     void platformWin64() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=win64", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformWin32A() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=win32A", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformWin32W() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=win32W", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win32W, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnix32() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix32", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnix32Unsigned() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix32-unsigned", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unix32, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnix64() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix64", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnix64Unsigned() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unix64-unsigned", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformNative() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=native", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Native, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Native, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnspecified() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=unspecified", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Native));
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unspecified, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Native));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unspecified, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformPlatformFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=avr8", "file.cpp"};
-        ASSERT(settings.platform.set(cppcheck::Platform::Type::Unspecified));
-        ASSERT_EQUALS(true, defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::File, settings.platform.type);
+        ASSERT(settings->platform.set(cppcheck::Platform::Type::Unspecified));
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::File, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void platformUnknown() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--platform=win128", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'win128'.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1174,13 +1205,12 @@ class TestCmdlineParser : public TestFixture {
         CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
 
         const char * const argv[] = {"cppcheck", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(parser->parseFromArgs(2, argv));
 #if defined(_WIN64)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings.platform.type);
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win64, settings->platform.type);
         ASSERT_EQUALS("cppcheck: Windows 64-bit binaries currently default to the 'win64' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win64' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
 #elif defined(_WIN32)
-        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings.platform.type);
+        ASSERT_EQUALS(cppcheck::Platform::Type::Win32A, settings->platform.type);
         ASSERT_EQUALS("cppcheck: Windows 32-bit binaries currently default to the 'win32A' platform. Starting with Cppcheck 2.13 they will default to 'native' instead. Please specify '--platform=win32A' explicitly if you rely on this.\n", GET_REDIRECT_OUTPUT);
 #endif
 
@@ -1193,9 +1223,8 @@ class TestCmdlineParser : public TestFixture {
         CmdLineParser::SHOW_DEF_PLATFORM_MSG = true;
 
         const char * const argv[] = {"cppcheck", "--platform=unix64", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings.platform.type);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(cppcheck::Platform::Type::Unix64, settings->platform.type);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
 
         CmdLineParser::SHOW_DEF_PLATFORM_MSG = false;
@@ -1205,9 +1234,9 @@ class TestCmdlineParser : public TestFixture {
     void plistEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--plist-output=", "file.cpp"};
-        settings.plistOutput = "";
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.plistOutput == "./");
+        settings->plistOutput = "";
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->plistOutput == "./");
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -1215,7 +1244,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--plist-output=./cppcheck_reports", "file.cpp"};
         // Fails since folder pointed by --plist-output= does not exist
-        ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
         // TODO: output contains non-native separator
         //ASSERT_EQUALS("cppcheck: error: plist folder does not exist: \"cppcheck_reports/\".\n", GET_REDIRECT_OUTPUT);
     }
@@ -1223,39 +1252,43 @@ class TestCmdlineParser : public TestFixture {
     void suppressionsOld() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppressions", "suppr.txt", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(4, argv));
+        ASSERT(!parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--suppressions\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void suppressions() {
-        // TODO: Fails because there is no suppr.txt file!
         REDIRECT;
+        ScopedFile file("suppr.txt",
+                        "uninitvar\n"
+                        "unusedFunction\n");
         const char * const argv[] = {"cppcheck", "--suppressions-list=suppr.txt", "file.cpp"};
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("", "cppcheck: error: couldn't open the file: \"suppr.txt\".\n", GET_REDIRECT_OUTPUT);
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(2, settings->nomsg.getSuppressions().size());
+        auto it = settings->nomsg.getSuppressions().cbegin();
+        ASSERT_EQUALS("uninitvar", (*it++).errorId);
+        ASSERT_EQUALS("unusedFunction", (*it).errorId);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
-    void suppressionsNoFile() {
+    void suppressionsNoFile1() {
         REDIRECT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(false, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
+        const char * const argv[] = {"cppcheck", "--suppressions-list=", "file.cpp"};
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(false, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr,b.suppr", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
+    void suppressionsNoFile2() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr,b.suppr", "file.cpp"};
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
+    }
 
-        CLEAR_REDIRECT_OUTPUT;
-        {
-            const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr b.suppr", "file.cpp"};
-            ASSERT_EQUALS(false, defParser.parseFromArgs(3, argv));
-            ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
-        }
+    void suppressionsNoFile3() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--suppressions-list=a.suppr b.suppr", "file.cpp"};
+        ASSERT_EQUALS(false, parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, GET_REDIRECT_OUTPUT.find("If you want to pass two files") != std::string::npos);
     }
 
     static Suppressions::ErrorMessage errorMessage(const std::string &errorId, const std::string &fileName, int lineNumber) {
@@ -1269,116 +1302,112 @@ class TestCmdlineParser : public TestFixture {
     void suppressionSingle() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1)));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void suppressionSingleFile() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar:file.cpp", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void suppressionTwo() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar,noConstructor", "file.cpp"};
-        settings = Settings();
-        TODO_ASSERT_EQUALS(true, false, defParser.parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS(true, false, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        TODO_ASSERT_EQUALS(true, false, settings.nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
+        TODO_ASSERT_EQUALS(true, false, parser->parseFromArgs(3, argv));
+        TODO_ASSERT_EQUALS(true, false, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        TODO_ASSERT_EQUALS(true, false, settings->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
         TODO_ASSERT_EQUALS("", "cppcheck: error: Failed to add suppression. Invalid id \"uninitvar,noConstructor\"\n", GET_REDIRECT_OUTPUT);
     }
 
     void suppressionTwoSeparate() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--suppress=uninitvar", "--suppress=noConstructor", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
-        ASSERT_EQUALS(true, settings.nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("uninitvar", "file.cpp", 1U)));
+        ASSERT_EQUALS(true, settings->nomsg.isSuppressed(errorMessage("noConstructor", "file.cpp", 1U)));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templates() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "{file}:{line},{severity},{id},{message}", "--template-location={file}:{line}:{column} {info}", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}:{line},{severity},{id},{message}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column} {info}", settings.templateLocation);
+        const char * const argv[] = {"cppcheck", "--template={file}:{line},{severity},{id},{message}", "--template-location={file}:{line}:{column} {info}", "file.cpp"};
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS("{file}:{line},{severity},{id},{message}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column} {info}", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesGcc() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "gcc", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: warning: {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
+        const char * const argv[] = {"cppcheck", "--template=gcc", "file.cpp"};
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: warning: {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesVs() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "vs", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file}({line}): {severity}: {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
+        const char * const argv[] = {"cppcheck", "--template=vs", "file.cpp"};
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}({line}): {severity}: {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesEdit() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--template", "edit", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS("{file} +{line}: {severity}: {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
+        const char * const argv[] = {"cppcheck", "--template=edit", "file.cpp"};
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file} +{line}: {severity}: {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesCppcheck1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template=cppcheck1", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{callstack}: ({severity}{inconclusive:, inconclusive}) {message}", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{callstack}: ({severity}{inconclusive:, inconclusive}) {message}", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesDaca2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template=daca2", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}", settings.templateLocation);
-        ASSERT_EQUALS(true, settings.daca);
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}", settings->templateLocation);
+        ASSERT_EQUALS(true, settings->daca);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templatesSelfcheck() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template=selfcheck", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -1386,119 +1415,123 @@ class TestCmdlineParser : public TestFixture {
     void templatesNoPlaceholder() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template=selfchek", "file.cpp"};
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("selfchek", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
+        TODO_ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("selfchek", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templateFormatInvalid() {
         REDIRECT;
         const char* const argv[] = { "cppcheck", "--template", "--template-location={file}", "file.cpp" };
-        ASSERT(!defParser.parseFromArgs(4, argv));
+        ASSERT(!parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--template' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
     // TODO: will not error out as he next option does not start with a "-"
     void templateFormatInvalid2() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
         const char* const argv[] = { "cppcheck", "--template", "file.cpp" };
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("file.cpp", settings.templateFormat);
-        ASSERT_EQUALS("", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("file.cpp", settings->templateFormat);
+        ASSERT_EQUALS("", settings->templateLocation);
+        TODO_ASSERT_EQUALS("cppcheck: error: argument to '--template' is missing.\n",
+                           "cppcheck: '--template <template>' is deprecated and will be removed in 2.13 - please use '--template=<template>' instead\n"
+                           "cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT);
     }
 
     // will use the default
     // TODO: bail out on empty?
     void templateFormatEmpty() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
         const char* const argv[] = { "cppcheck", "--template=", "file.cpp" };
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templateLocationInvalid() {
         REDIRECT;
         const char* const argv[] = { "cppcheck", "--template-location", "--template={file}", "file.cpp" };
-        ASSERT(!defParser.parseFromArgs(4, argv));
+        ASSERT(!parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--template-location' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
-    // TODO: will not error out as he next option does not start with a "-"
+    // TODO: will not error out as the next option does not start with a "-"
     void templateLocationInvalid2() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
         const char* const argv[] = { "cppcheck", "--template-location", "file.cpp" };
-        TODO_ASSERT(!defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("file.cpp", settings.templateLocation);
-        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+        ASSERT(!parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("file.cpp", settings->templateLocation);
+        TODO_ASSERT_EQUALS("",
+                           "cppcheck: '--template-location <template>' is deprecated and will be removed in 2.13 - please use '--template-location=<template>' instead\n"
+                           "cppcheck: error: no C or C++ source files found.\n", GET_REDIRECT_OUTPUT);
     }
 
     // will use the default
     // TODO: bail out on empty?
     void templateLocationEmpty() {
         REDIRECT;
-        settings.templateFormat.clear();
-        settings.templateLocation.clear();
+        settings->templateFormat.clear();
+        settings->templateLocation.clear();
         const char* const argv[] = { "cppcheck", "--template-location=", "file.cpp" };
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings.templateFormat);
-        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings.templateLocation);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS("{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:} {message} [{id}]\n{code}", settings->templateFormat);
+        ASSERT_EQUALS("{file}:{line}:{column}: note: {info}\n{code}", settings->templateLocation);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void xml() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(1, settings.xml_version);
+        settings->xml_version = 1;
+        settings->xml = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->xml);
+        ASSERT_EQUALS(1, settings->xml_version);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void xmlver2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml-version=2", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
+        settings->xml_version = 1;
+        settings->xml = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->xml);
+        ASSERT_EQUALS(2, settings->xml_version);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void xmlver2both() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=2", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
+        settings->xml_version = 1;
+        settings->xml = false;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT(settings->xml);
+        ASSERT_EQUALS(2, settings->xml_version);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void xmlver2both2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml-version=2", "--xml", "file.cpp"};
-        settings.xml_version = 1;
-        settings.xml = false;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT(settings.xml);
-        ASSERT_EQUALS(2, settings.xml_version);
+        settings->xml_version = 1;
+        settings->xml = false;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT(settings->xml);
+        ASSERT_EQUALS(2, settings->xml_version);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -1506,7 +1539,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=3", "file.cpp"};
         // FAils since unknown XML format version
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: '--xml-version' can only be 2.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1514,91 +1547,90 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--xml", "--xml-version=a", "file.cpp"};
         // FAils since unknown XML format version
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--xml-version=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void doc() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--doc"};
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(defParser.exitAfterPrinting());
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT(parser->exitAfterPrinting());
         ASSERT(GET_REDIRECT_OUTPUT.find("## ") == 0);
     }
 
     void showtime() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--showtime=summary"};
-        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY);
+        const char * const argv[] = {"cppcheck", "--showtime=summary", "file.cpp"};
+        settings->showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void errorlist1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--errorlist"};
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(defParser.getShowErrorMessages());
+        ASSERT(parser->parseFromArgs(2, argv));
+        ASSERT(parser->getShowErrorMessages());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void errorlistverbose1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--verbose", "--errorlist"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.verbose);
+        settings->verbose = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->verbose);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void errorlistverbose2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--errorlist", "--verbose"};
-        settings.verbose = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT(settings.verbose);
+        settings->verbose = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->verbose);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorepathsnopath() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
         // Fails since no ignored path given
-        ASSERT_EQUALS(false, parser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-i' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
     void exceptionhandling() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling"};
-        settings.exceptionHandling = false;
+        const char * const argv[] = {"cppcheck", "--exception-handling", "file.cpp"};
+        settings->exceptionHandling = false;
         CppCheckExecutor::setExceptionOutput(stderr);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->exceptionHandling);
         ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void exceptionhandling2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling=stderr"};
-        settings.exceptionHandling = false;
+        const char * const argv[] = {"cppcheck", "--exception-handling=stderr", "file.cpp"};
+        settings->exceptionHandling = false;
         CppCheckExecutor::setExceptionOutput(stdout);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->exceptionHandling);
         ASSERT_EQUALS(stderr, CppCheckExecutor::getExceptionOutput());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void exceptionhandling3() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--exception-handling=stdout"};
-        settings.exceptionHandling = false;
+        const char * const argv[] = {"cppcheck", "--exception-handling=stdout", "file.cpp"};
+        settings->exceptionHandling = false;
         CppCheckExecutor::setExceptionOutput(stderr);
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.exceptionHandling);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->exceptionHandling);
         ASSERT_EQUALS(stdout, CppCheckExecutor::getExceptionOutput());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
@@ -1606,105 +1638,105 @@ class TestCmdlineParser : public TestFixture {
     void exceptionhandlingInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exception-handling=exfile"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: invalid '--exception-handling' argument\n", GET_REDIRECT_OUTPUT);
     }
 
     void exceptionhandlingInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--exception-handling-foo"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--exception-handling-foo\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void clang() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--clang"};
-        settings.clang = false;
-        settings.clangExecutable = "exe";
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.clang);
-        ASSERT_EQUALS("exe", settings.clangExecutable);
+        const char * const argv[] = {"cppcheck", "--clang", "file.cpp"};
+        settings->clang = false;
+        settings->clangExecutable = "exe";
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->clang);
+        ASSERT_EQUALS("exe", settings->clangExecutable);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void clang2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--clang=clang-14"};
-        settings.clang = false;
-        settings.clangExecutable = "";
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT(settings.clang);
-        ASSERT_EQUALS("clang-14", settings.clangExecutable);
+        const char * const argv[] = {"cppcheck", "--clang=clang-14", "file.cpp"};
+        settings->clang = false;
+        settings->clangExecutable = "";
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT(settings->clang);
+        ASSERT_EQUALS("clang-14", settings->clangExecutable);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void clangInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--clang-foo"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--clang-foo\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void valueFlowMaxIterations() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0"};
-        settings.valueFlowMaxIterations = SIZE_MAX;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(0, settings.valueFlowMaxIterations);
+        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=0", "file.cpp"};
+        settings->valueFlowMaxIterations = SIZE_MAX;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(0, settings->valueFlowMaxIterations);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void valueFlowMaxIterations2() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11"};
-        settings.valueFlowMaxIterations = SIZE_MAX;
-        ASSERT(defParser.parseFromArgs(2, argv));
-        ASSERT_EQUALS(11, settings.valueFlowMaxIterations);
+        const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=11", "file.cpp"};
+        settings->valueFlowMaxIterations = SIZE_MAX;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(11, settings->valueFlowMaxIterations);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void valueFlowMaxIterationsInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
+        ASSERT(!parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--valueflow-max-iterations\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void valueFlowMaxIterationsInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=seven"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
+        ASSERT(!parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void valueFlowMaxIterationsInvalid3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--valueflow-max-iterations=-1"};
-        ASSERT(!defParser.parseFromArgs(2, argv));
+        ASSERT(!parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--valueflow-max-iterations=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
     }
 
     void checksMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=12", "file.cpp"};
-        settings.checksMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.checksMaxTime);
+        settings->checksMaxTime = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->checksMaxTime);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void checksMaxTime2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' needs to be a positive integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void checksMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--checks-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--checks-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1712,25 +1744,25 @@ class TestCmdlineParser : public TestFixture {
     void loadAverage() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "12", "file.cpp"};
-        settings.loadAverage = 0;
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(12, settings.loadAverage);
+        settings->loadAverage = 0;
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(12, settings->loadAverage);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void loadAverage2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l12", "file.cpp"};
-        settings.loadAverage = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.loadAverage);
+        settings->loadAverage = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->loadAverage);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void loadAverageInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-l", "one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(4, argv));
+        ASSERT(!parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-l' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 #endif
@@ -1738,193 +1770,185 @@ class TestCmdlineParser : public TestFixture {
     void maxCtuDepth() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=12", "file.cpp"};
-        settings.maxCtuDepth = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.maxCtuDepth);
+        settings->maxCtuDepth = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->maxCtuDepth);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void maxCtuDepthInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--max-ctu-depth=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--max-ctu-depth=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void performanceValueflowMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=12", "file.cpp"};
-        settings.performanceValueFlowMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.performanceValueFlowMaxTime);
+        settings->performanceValueFlowMaxTime = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->performanceValueFlowMaxTime);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void performanceValueflowMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void performanceValueFlowMaxIfCount() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=12", "file.cpp"};
-        settings.performanceValueFlowMaxIfCount = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.performanceValueFlowMaxIfCount);
+        settings->performanceValueFlowMaxIfCount = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->performanceValueFlowMaxIfCount);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void performanceValueFlowMaxIfCountInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--performance-valueflow-max-if-count=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--performance-valueflow-max-if-count=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void templateMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=12", "file.cpp"};
-        settings.templateMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.templateMaxTime);
+        settings->templateMaxTime = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->templateMaxTime);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void templateMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void templateMaxTimeInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--template-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--template-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
     }
 
     void typedefMaxTime() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=12", "file.cpp"};
-        settings.typedefMaxTime = 0;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(12, settings.typedefMaxTime);
+        settings->typedefMaxTime = 0;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(12, settings->typedefMaxTime);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void typedefMaxTimeInvalid() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=one", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - not an integer.\n", GET_REDIRECT_OUTPUT);
     }
 
     void typedefMaxTimeInvalid2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--typedef-max-time=-1", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '--typedef-max-time=' is not valid - needs to be positive.\n", GET_REDIRECT_OUTPUT);
     }
 
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorepaths2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i", "src", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorepaths3() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser.getIgnoredPaths()[1]);
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(2, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
+        ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorepaths4() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(6, argv));
-        ASSERT_EQUALS(2, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src", parser.getIgnoredPaths()[0]);
-        ASSERT_EQUALS("module", parser.getIgnoredPaths()[1]);
+        ASSERT(parser->parseFromArgs(6, argv));
+        ASSERT_EQUALS(2, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("src", parser->getIgnoredPaths()[0]);
+        ASSERT_EQUALS("module", parser->getIgnoredPaths()[1]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorefilepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("foo.cpp", parser.getIgnoredPaths()[0]);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("foo.cpp", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void ignorefilepaths2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
-        CmdLineParser parser(settings, settings.nomsg, settings.nofail);
-        ASSERT(parser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, parser.getIgnoredPaths().size());
-        ASSERT_EQUALS("src/foo.cpp", parser.getIgnoredPaths()[0]);
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
+        ASSERT_EQUALS("src/foo.cpp", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void checkconfig() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--check-config", "file.cpp"};
-        settings.checkConfiguration = false;
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(true, settings.checkConfiguration);
+        settings->checkConfiguration = false;
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(true, settings->checkConfiguration);
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void unknownParam() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--foo", "file.cpp"};
-        ASSERT(!defParser.parseFromArgs(3, argv));
+        ASSERT(!parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("cppcheck: error: unrecognized command line option: \"--foo\".\n", GET_REDIRECT_OUTPUT);
     }
 
     void undefs() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U_WIN32", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(3, argv));
-        ASSERT_EQUALS(1, settings.userUndefs.size());
-        ASSERT(settings.userUndefs.find("_WIN32") != settings.userUndefs.end());
+        ASSERT(parser->parseFromArgs(3, argv));
+        ASSERT_EQUALS(1, settings->userUndefs.size());
+        ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void undefs2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U_WIN32", "-UNODEBUG", "file.cpp"};
-        settings = Settings();
-        ASSERT(defParser.parseFromArgs(4, argv));
-        ASSERT_EQUALS(2, settings.userUndefs.size());
-        ASSERT(settings.userUndefs.find("_WIN32") != settings.userUndefs.end());
-        ASSERT(settings.userUndefs.find("NODEBUG") != settings.userUndefs.end());
+        ASSERT(parser->parseFromArgs(4, argv));
+        ASSERT_EQUALS(2, settings->userUndefs.size());
+        ASSERT(settings->userUndefs.find("_WIN32") != settings->userUndefs.end());
+        ASSERT(settings->userUndefs.find("NODEBUG") != settings->userUndefs.end());
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
@@ -1932,7 +1956,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U"};
         // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1940,7 +1964,7 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U", "-v", "file.cpp"};
         // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
@@ -1948,28 +1972,28 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-U", "--quiet", "file.cpp"};
         // Fails since -U has no param
-        ASSERT_EQUALS(false, defParser.parseFromArgs(4, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(4, argv));
         ASSERT_EQUALS("cppcheck: error: argument to '-U' is missing.\n", GET_REDIRECT_OUTPUT);
     }
 
     void cppcheckBuildDirExistent() {
         REDIRECT;
-        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=."};
-        ASSERT_EQUALS(true, defParser.parseFromArgs(2, argv));
+        const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=.", "file.cpp"};
+        ASSERT_EQUALS(true, parser->parseFromArgs(3, argv));
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
     void cppcheckBuildDirNonExistent() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--cppcheck-build-dir=non-existent-path"};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: Directory 'non-existent-path' specified by --cppcheck-build-dir argument has to be existent.\n", GET_REDIRECT_OUTPUT);
     }
 
     void cppcheckBuildDirEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--cppcheck-build-dir="};
-        ASSERT_EQUALS(false, defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS(false, parser->parseFromArgs(2, argv));
         ASSERT_EQUALS("cppcheck: error: Directory '' specified by --cppcheck-build-dir argument has to be existent.\n", GET_REDIRECT_OUTPUT);
     }
 };
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index c79b50a842e..b60be8b831b 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -150,7 +150,7 @@ class TestCondition : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Run checks..
-        runChecks<CheckCondition>(&tokenizer, &settings, this);
+        runChecks<CheckCondition>(tokenizer, this);
     }
 
     void check(const char code[], const char* filename = "test.cpp", bool inconclusive = false) {
@@ -554,7 +554,7 @@ class TestCondition : public TestFixture {
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
-        runChecks<CheckCondition>(&tokenizer, &settings1, this);
+        runChecks<CheckCondition>(tokenizer, this);
     }
 
     void overlappingElseIfCondition() {
@@ -4514,6 +4514,21 @@ class TestCondition : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'a==\"x\"' is always true\n", errout.str());
+
+        check("void g(bool);\n"
+              "void f() {\n"
+              "    int i = 5;\n"
+              "    int* p = &i;\n"
+              "    g(i == 7);\n"
+              "    g(p == nullptr);\n"
+              "    g(p);\n"
+              "    g(&i);\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:5]: (style) Condition 'i==7' is always false\n"
+                      "[test.cpp:6]: (style) Condition 'p==nullptr' is always false\n"
+                      "[test.cpp:7]: (style) Condition 'p' is always true\n"
+                      "[test.cpp:8]: (style) Condition '&i' is always true\n",
+                      errout.str());
     }
 
     void alwaysTrueSymbolic()
@@ -5028,6 +5043,21 @@ class TestCondition : public TestFixture {
               "    return -1;\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:5]: (style) Condition 's.empty()' is always false\n", errout.str());
+
+        check("void f(std::string& p) {\n"
+              "    const std::string d{ \"abc\" };\n"
+              "    p += d;\n"
+              "    if(p.empty()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:4]: (style) Condition 'p.empty()' is always false\n", errout.str());
+
+        check("bool f(int i, FILE* fp) {\n"
+              "  std::string s = \"abc\";\n"
+              "  s += std::to_string(i);\n"
+              "  s += \"\\n\";\n"
+              "  return fwrite(s.c_str(), 1, s.length(), fp) == s.length();\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void alwaysTrueLoop()
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index 481f67bb7a7..14de5539047 100644
--- a/test/testerrorlogger.cpp
+++ b/test/testerrorlogger.cpp
@@ -61,7 +61,6 @@ class TestErrorLogger : public TestFixture {
         TEST_CASE(SerializeSanitize);
         TEST_CASE(SerializeFileLocation);
 
-        TEST_CASE(suppressUnmatchedSuppressions);
         TEST_CASE(substituteTemplateFormatStatic);
         TEST_CASE(substituteTemplateLocationStatic);
     }
@@ -425,64 +424,6 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("abcd:/,", msg2.callStack.front().getinfo());
     }
 
-    void suppressUnmatchedSuppressions() {
-        std::list<Suppressions::Suppression> suppressions;
-
-        // No unmatched suppression
-        errout.str("");
-        suppressions.clear();
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "*", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression (corresponds to "--suppress=unmatchedSuppression")
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress all unmatchedSuppression in a.c
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // suppress unmatchedSuppression in a.c at line 10
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 10U);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("", errout.str());
-
-        // don't suppress unmatchedSuppression when file is mismatching
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "b.c", Suppressions::Suppression::NO_LINE);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
-
-        // don't suppress unmatchedSuppression when line is mismatching
-        errout.str("");
-        suppressions.clear();
-        suppressions.emplace_back("abc", "a.c", 10U);
-        suppressions.emplace_back("unmatchedSuppression", "a.c", 1U);
-        reportUnmatchedSuppressions(suppressions);
-        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
-    }
-
     void substituteTemplateFormatStatic() const
     {
         {
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
index 97df8227547..76291ee8541 100644
--- a/test/testexceptionsafety.cpp
+++ b/test/testexceptionsafety.cpp
@@ -71,7 +71,7 @@ class TestExceptionSafety : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check char variable usage..
-        runChecks<CheckExceptionSafety>(&tokenizer, &settings1, this);
+        runChecks<CheckExceptionSafety>(tokenizer, this);
     }
 
     void destructors() {
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index 9d895dcecba..13589ac1386 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -127,7 +127,7 @@ class TestFunctions : public TestFixture {
                 errout << errline << "\n";
         }
 
-        runChecks<CheckFunctions>(&tokenizer, settings_, this);
+        runChecks<CheckFunctions>(tokenizer, this);
     }
 
     void prohibitedFunctions_posix() {
diff --git a/test/testgarbage.cpp b/test/testgarbage.cpp
index 83219bacf76..d0947e3e105 100644
--- a/test/testgarbage.cpp
+++ b/test/testgarbage.cpp
@@ -296,7 +296,7 @@ class TestGarbage : public TestFixture {
 
         // call all "runChecks" in all registered Check classes
         for (std::list<Check *>::const_iterator it = Check::instances().cbegin(); it != Check::instances().cend(); ++it) {
-            (*it)->runChecks(&tokenizer, &settings, this);
+            (*it)->runChecks(tokenizer, this);
         }
 
         return tokenizer.tokens()->stringifyList(false, false, false, true, false, nullptr, nullptr);
@@ -311,7 +311,7 @@ class TestGarbage : public TestFixture {
         } catch (InternalError& e) {
             if (e.id != "syntaxError")
                 return "";
-            return "[test.cpp:" + MathLib::toString(e.token->linenr()) + "] " + e.errorMessage;
+            return "[test.cpp:" + std::to_string(e.token->linenr()) + "] " + e.errorMessage;
         }
         return "";
     }
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 4092e45e9c6..8887b701f06 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -59,7 +59,7 @@ class TestInternal : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        runChecks<CheckInternal>(&tokenizer, &settings, this);
+        runChecks<CheckInternal>(tokenizer, this);
     }
 
     void simplePatternInTokenMatch() {
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
index c5e2dca4fbd..183fefa5859 100644
--- a/test/testleakautovar.cpp
+++ b/test/testleakautovar.cpp
@@ -242,7 +242,7 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, cpp ? "test.cpp" : "test.c"), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings1, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void check_(const char* file, int line, const char code[], const Settings & s) {
@@ -257,7 +257,7 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings0, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void assign1() {
@@ -2847,7 +2847,7 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
@@ -2893,7 +2893,7 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
@@ -2953,7 +2953,7 @@ class TestLeakAutoVarWindows : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.c"), file, line);
 
         // Check for leaks..
-        runChecks<CheckLeakAutoVar>(&tokenizer, &settings, this);
+        runChecks<CheckLeakAutoVar>(tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index e49d08afa17..7b9e5acd590 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -382,6 +382,8 @@ class TestMathLib : public TestFixture {
         ASSERT_THROW_EQUALS(MathLib::toLongNumber("-02000000000000000000000"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: -02000000000000000000000");
 
         // min/max and out-of-bounds - decimal
+        SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
+        SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
         {
             const MathLib::bigint i = 18446744073709551615;
             ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
@@ -392,8 +394,10 @@ class TestMathLib : public TestFixture {
             ASSERT_EQUALS(i, MathLib::toLongNumber(std::to_string(i)));
             ASSERT_EQUALS(i, MathLib::toLongNumber("-18446744073709551615"));
         }
+        SUPPRESS_WARNING_GCC_POP
+        SUPPRESS_WARNING_CLANG_POP
 
-        ASSERT_THROW_EQUALS(MathLib::toLongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: 18446744073709551616");
+            ASSERT_THROW_EQUALS(MathLib::toLongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: 18446744073709551616");
         ASSERT_THROW_EQUALS(MathLib::toLongNumber("-18446744073709551616"), InternalError, "Internal Error. MathLib::toLongNumber: out_of_range: -18446744073709551616");
 
         ASSERT_THROW_EQUALS(MathLib::toLongNumber("invalid"), InternalError, "Internal Error. MathLib::toLongNumber: invalid_argument: invalid");
@@ -539,6 +543,8 @@ class TestMathLib : public TestFixture {
         ASSERT_THROW_EQUALS(MathLib::toULongNumber("-02000000000000000000000"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: -02000000000000000000000");
 
         // min/max and out-of-bounds - decimal
+        SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
+        SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
         {
             const MathLib::biguint u = 18446744073709551615;
             ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
@@ -549,8 +555,10 @@ class TestMathLib : public TestFixture {
             ASSERT_EQUALS(u, MathLib::toULongNumber(std::to_string(u)));
             ASSERT_EQUALS(u, MathLib::toULongNumber("-18446744073709551615"));
         }
+        SUPPRESS_WARNING_GCC_POP
+        SUPPRESS_WARNING_CLANG_POP
 
-        ASSERT_THROW_EQUALS(MathLib::toULongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: 18446744073709551616");
+            ASSERT_THROW_EQUALS(MathLib::toULongNumber("18446744073709551616"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: 18446744073709551616");
         ASSERT_THROW_EQUALS(MathLib::toULongNumber("-18446744073709551616"), InternalError, "Internal Error. MathLib::toULongNumber: out_of_range: -18446744073709551616");
 
         ASSERT_THROW_EQUALS(MathLib::toULongNumber("invalid"), InternalError, "Internal Error. MathLib::toULongNumber: invalid_argument: invalid");
@@ -1455,23 +1463,12 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("0.0", MathLib::toString(0.0));
         ASSERT_EQUALS("0.0", MathLib::toString(+0.0));
         ASSERT_EQUALS("0.0", MathLib::toString(-0.0));
-        // float (trailing f or F)
-        ASSERT_EQUALS("0.000000", MathLib::toString(0.0f));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0f));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0f));
-        ASSERT_EQUALS("0.000000", MathLib::toString(0.0F));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0F));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0F));
-        // double (tailing l or L)
-        ASSERT_EQUALS("0.000000",  MathLib::toString(0.0l));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0l));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0l));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(0.0L));
-        ASSERT_EQUALS("0.000000",  MathLib::toString(+0.0L));
-        ASSERT_EQUALS("-0.000000", MathLib::toString(-0.0L));
 
         ASSERT_EQUALS("1e-08", MathLib::toString(0.00000001));
         ASSERT_EQUALS("-1e-08", MathLib::toString(-0.00000001));
+
+        ASSERT_EQUALS("2.22507385851e-308", MathLib::toString(std::numeric_limits<double>::min()));
+        ASSERT_EQUALS("1.79769313486e+308", MathLib::toString(std::numeric_limits<double>::max()));
     }
 
     void CPP14DigitSeparators() const { // Ticket #7137, #7565
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 51d37e6eff9..7da0da44cf7 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -189,7 +189,7 @@ class TestNullPointer : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(&tokenizer, &settings1, this);
+        runChecks<CheckNullPointer>(tokenizer, this);
     }
 
     void checkP(const char code[]) {
@@ -214,7 +214,7 @@ class TestNullPointer : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(&tokenizer, &settings1, this);
+        runChecks<CheckNullPointer>(tokenizer, this);
     }
 
 
diff --git a/test/testother.cpp b/test/testother.cpp
index eb1b300122f..d789c3bb18c 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -317,7 +317,7 @@ class TestOther : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename ? filename : "test.cpp"), file, line);
 
         // Check..
-        runChecks<CheckOther>(&tokenizer, settings, this);
+        runChecks<CheckOther>(tokenizer, this);
 
         (void)runSimpleChecks; // TODO Remove this
     }
@@ -358,7 +358,7 @@ class TestOther : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Check..
-        runChecks<CheckOther>(&tokenizer, settings, this);
+        runChecks<CheckOther>(tokenizer, this);
     }
 
     void checkInterlockedDecrement(const char code[]) {
@@ -5648,6 +5648,12 @@ class TestOther : public TestFixture {
                       "[test.cpp:6]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n"
                       "[test.cpp:9]: (style) Instance of 'std::scoped_lock' object is destroyed immediately.\n",
                       errout.str());
+
+        check("struct S { int i; };\n"
+              "namespace {\n"
+              "    S s() { return ::S{42}; }\n"
+              "}\n", "test.cpp");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void testMisusedScopeObjectAssignment() { // #11371
@@ -10899,6 +10905,14 @@ class TestOther : public TestFixture {
               "}");
         ASSERT_EQUALS("[test.cpp:3]: (style) Argument '(int)((x&0x01)>>7)' to function g is always 0. It does not matter what value 'x' has.\n", errout.str());
 
+        check("void g(int, int);\n"
+              "void f(int x) {\n"
+              "   g(x, (x & 0x01) >> 7);\n"
+              "}");
+        ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Argument '(x&0x01)>>7' to function g is always 0. It does not matter what value 'x' has.\n",
+            errout.str());
+
         check("void g(int);\n"
               "void f(int x) {\n"
               "    g(0);\n"
@@ -11285,6 +11299,12 @@ class TestOther : public TestFixture {
               "}");
         ASSERT_EQUALS("", errout.str());
 
+        check("_Bool a[10];\n" // #10350
+              "void foo() {\n"
+              "    memcpy(&a[5], &a[4], 2u * sizeof(a[0]));\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Overlapping read/write in memcpy() is undefined behavior\n", errout.str());
+
         // wmemcpy
         check("void foo() {\n"
               "    wchar_t a[10];\n"
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
index e16e4db6c72..e35c0d153b8 100644
--- a/test/testsizeof.cpp
+++ b/test/testsizeof.cpp
@@ -62,7 +62,7 @@ class TestSizeof : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check...
-        runChecks<CheckSizeof>(&tokenizer, &settings, this);
+        runChecks<CheckSizeof>(tokenizer, this);
     }
 
     void checkP(const char code[]) {
@@ -85,7 +85,7 @@ class TestSizeof : public TestFixture {
         tokenizer.simplifyTokens1("");
 
         // Check...
-        runChecks<CheckSizeof>(&tokenizer, &settings, this);
+        runChecks<CheckSizeof>(tokenizer, this);
     }
 
     void sizeofsizeof() {
diff --git a/test/teststl.cpp b/test/teststl.cpp
index bb9f3ad7b57..5b1b7a65fd8 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -188,7 +188,7 @@ class TestStl : public TestFixture {
 
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
-        runChecks<CheckStl>(&tokenizer, &settings1, this);
+        runChecks<CheckStl>(tokenizer, this);
     }
 
     void check_(const char* file, int line, const std::string& code, const bool inconclusive = false) {
@@ -206,7 +206,7 @@ class TestStl : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        runChecks<CheckStl>(&tokenizer, &settings, this);
+        runChecks<CheckStl>(tokenizer, this);
     }
 
     void outOfBounds() {
diff --git a/test/teststring.cpp b/test/teststring.cpp
index 2f5b9f559fe..87ffcccaaf0 100644
--- a/test/teststring.cpp
+++ b/test/teststring.cpp
@@ -71,7 +71,7 @@ class TestString : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check char variable usage..
-        runChecks<CheckString>(&tokenizer, &settings, this);
+        runChecks<CheckString>(tokenizer, this);
     }
 
     void stringLiteralWrite() {
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index f1c6a7d8a47..19fdf307c14 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -83,6 +83,8 @@ class TestSuppressions : public TestFixture {
 
         TEST_CASE(suppressingSyntaxErrorAndExitCode);
         TEST_CASE(suppressLocal);
+
+        TEST_CASE(suppressUnmatchedSuppressions);
     }
 
     void suppressionsBadId1() const {
@@ -859,6 +861,64 @@ class TestSuppressions : public TestFixture {
         ASSERT_EQUALS(true, suppressions.isSuppressed(errorMessage("errorid2", "test2.cpp", 1)));
         ASSERT_EQUALS(false, suppressions.isSuppressed(errorMessage("errorid2", "test2.cpp", 1), false));
     }
+
+    void suppressUnmatchedSuppressions() {
+        std::list<Suppressions::Suppression> suppressions;
+
+        // No unmatched suppression
+        errout.str("");
+        suppressions.clear();
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("", errout.str());
+
+        // suppress all unmatchedSuppression
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "*", Suppressions::Suppression::NO_LINE);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("", errout.str());
+
+        // suppress all unmatchedSuppression (corresponds to "--suppress=unmatchedSuppression")
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "", Suppressions::Suppression::NO_LINE);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("", errout.str());
+
+        // suppress all unmatchedSuppression in a.c
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "a.c", Suppressions::Suppression::NO_LINE);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("", errout.str());
+
+        // suppress unmatchedSuppression in a.c at line 10
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "a.c", 10U);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("", errout.str());
+
+        // don't suppress unmatchedSuppression when file is mismatching
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "b.c", Suppressions::Suppression::NO_LINE);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
+
+        // don't suppress unmatchedSuppression when line is mismatching
+        errout.str("");
+        suppressions.clear();
+        suppressions.emplace_back("abc", "a.c", 10U);
+        suppressions.emplace_back("unmatchedSuppression", "a.c", 1U);
+        Suppressions::reportUnmatchedSuppressions(suppressions, *this);
+        ASSERT_EQUALS("[a.c:10]: (information) Unmatched suppression: abc\n", errout.str());
+    }
 };
 
 REGISTER_TEST(TestSuppressions)
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 13e719e46c6..e558e4d3a36 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -510,6 +510,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(auto18);
         TEST_CASE(auto19);
         TEST_CASE(auto20);
+        TEST_CASE(auto21);
 
         TEST_CASE(unionWithConstructor);
 
@@ -1921,6 +1922,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(10, db->variableList().size() - 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(1) && db->getVariableFromVarId(1)->dimensions().size() == 1);
         ASSERT_EQUALS(true, db->getVariableFromVarId(2) != nullptr);
+        // NOLINTNEXTLINE(readability-container-size-empty)
         ASSERT_EQUALS(true, db->getVariableFromVarId(3) && db->getVariableFromVarId(3)->dimensions().size() == 0);
         ASSERT_EQUALS(true, db->getVariableFromVarId(4) != nullptr);
         ASSERT_EQUALS(true, db->getVariableFromVarId(5) != nullptr);
@@ -5715,8 +5717,7 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(E1->value, 1);
         const Token* const a = Token::findsimplematch(tokenizer.tokens(), "auto");
         ASSERT(a && a->valueType());
-        TODO_ASSERT(E1->scope == a->valueType()->typeScope);
-        ASSERT_EQUALS(a->valueType()->type, ValueType::INT);
+        ASSERT(E1->scope == a->valueType()->typeScope);
     }
 
     void sizeOfType() {
@@ -9398,7 +9399,6 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT(autoTok && autoTok->valueType());
         ASSERT_EQUALS(autoTok->valueType()->constness, 3);
         ASSERT_EQUALS(autoTok->valueType()->pointer, 1);
-        TODO_ASSERT(autoTok->valueType()->reference == Reference::LValue);
     }
 
     void auto19() { // #11517
@@ -9453,6 +9453,23 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(g->function()->tokenDef->linenr(), 4);
     }
 
+    void auto21() {
+        GET_SYMBOL_DB("int f(bool b) {\n"
+                      "    std::vector<int> v1(1), v2(2);\n"
+                      "    auto& v = b ? v1 : v2;\n"
+                      "    v.push_back(1);\n"
+                      "    return v.size();\n"
+                      "}\n");
+        ASSERT_EQUALS("", errout.str());
+        const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
+        ASSERT(a && a->valueType());
+        ASSERT_EQUALS(a->valueType()->type, ValueType::CONTAINER);
+        const Token* v = Token::findsimplematch(a, "v . size");
+        ASSERT(v && v->valueType());
+        ASSERT_EQUALS(v->valueType()->type, ValueType::CONTAINER);
+        ASSERT(v->variable() && v->variable()->isReference());
+    }
+
     void unionWithConstructor() {
         GET_SYMBOL_DB("union Fred {\n"
                       "    Fred(int x) : i(x) { }\n"
diff --git a/test/testtype.cpp b/test/testtype.cpp
index 3d84c618024..65f26d5c9f1 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -56,7 +56,7 @@ class TestType : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);
 
         // Check..
-        runChecks<CheckType>(&tokenizer, &settings1, this);
+        runChecks<CheckType>(tokenizer, this);
     }
 
     void checkTooBigShift_Unix32() {
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index f7432725df5..9cc8b5030cb 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -4787,6 +4787,21 @@ class TestUninitVar : public TestFixture {
                        "  }\n"
                        "}");
         ASSERT_EQUALS("", errout.str());
+
+        checkUninitVar("struct S { int x; };\n"
+                       "S h() {\n"
+                       "    S s;\n"
+                       "    S& r = s;\n"
+                       "    r.x = 0;\n"
+                       "    return s;\n"
+                       "}\n"
+                       "S i() {\n"
+                       "    S s;\n"
+                       "    S& r{ s };\n"
+                       "    r.x = 0;\n"
+                       "    return s;\n"
+                       "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void uninitvar2_while() {
@@ -6169,6 +6184,19 @@ class TestUninitVar : public TestFixture {
                         "   return s->i;\n"
                         "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        valueFlowUninit("int f(int i) {\n"
+                        "    int x;\n"
+                        "    int* p = &x;\n"
+                        "    return i >> *p;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: *p\n", errout.str());
+
+        valueFlowUninit("void f(int& x) {\n"
+                        "    int i;\n"
+                        "    x = i;\n"
+                        "}\n");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: i\n", errout.str());
     }
 
     void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value
@@ -6181,7 +6209,7 @@ class TestUninitVar : public TestFixture {
                         "    memcpy(wcsin, x, sizeof(wcsstruct));\n" // <- warning
                         "    x->wcsprm = NULL;\n" // <- no warning
                         "}");
-        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: x.wcsprm\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:7]: (error) Uninitialized variable: x\n", errout.str());
 
         valueFlowUninit("struct wcsstruct {\n"
                         "    int *wcsprm;\n"
@@ -7009,8 +7037,7 @@ class TestUninitVar : public TestFixture {
                         "    memcpy(in, s, sizeof(S));\n"
                         "    s->p = NULL;\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: s.p\n",
-                      errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: s\n", errout.str());
 
         valueFlowUninit("struct S {\n" // #11321
                         "    int a = 0;\n"
@@ -7270,7 +7297,7 @@ class TestUninitVar : public TestFixture {
                         "    A::B b;\n"
                         "    x.push_back(b);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: b.i\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: b\n", errout.str());
 
         valueFlowUninit("struct A {\n"
                         "    struct B {\n"
@@ -7294,7 +7321,7 @@ class TestUninitVar : public TestFixture {
                         "    A a;\n"
                         "    x.push_back(a);\n"
                         "}\n");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: a.j\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9]: (error) Uninitialized variable: a\n", errout.str());
 
         valueFlowUninit("struct S { struct T { int* p; } t[2]; };\n" // #11018
                         "void f() {\n"
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp
index d160336f300..90769ee8387 100644
--- a/test/testvaarg.cpp
+++ b/test/testvaarg.cpp
@@ -43,7 +43,7 @@ class TestVaarg : public TestFixture {
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        runChecks<CheckVaarg>(&tokenizer, &settings, this);
+        runChecks<CheckVaarg>(tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 8a50059ef89..f24942164fa 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -6616,7 +6616,7 @@ class TestValueFlow : public TestFixture {
                "  if (a.empty() && b.empty()) {}\n"
                "  else if (a.empty() == false && b.empty() == false) {}\n"
                "}\n";
-        ASSERT("" != isImpossibleContainerSizeValue(tokenValues(code, "a . empty ( ) == false"), 0));
+        ASSERT(!isImpossibleContainerSizeValue(tokenValues(code, "a . empty ( ) == false"), 0).empty());
 
         code = "bool g(std::vector<int>& v) {\n"
                "    v.push_back(1);\n"
@@ -7354,6 +7354,22 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "}\n";
         valueOfTok(code, "i");
+
+        code = "void f() {\n"
+               "    if (llabs(0x80000000ffffffffL) == 0x7fffffff00000001L) {}\n"
+               "}\n";
+        valueOfTok(code, "f");
+
+        code = "struct T {\n"
+               "    T();\n"
+               "    static T a[6][64];\n"
+               "    static T b[2][64];\n"
+               "    static T c[64][64];\n"
+               "    static T d[2][64];\n"
+               "    static T e[64];\n"
+               "    static T f[64];\n"
+               "};\n";
+        valueOfTok(code, "(");
     }
 
     void valueFlowCrashConstructorInitialization() { // #9577
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 341c24c2d9c..c3d2fcd76bf 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -2122,7 +2122,7 @@ class TestVarID : public TestFixture {
     }
 
     static std::string getLine(const std::string &code, int lineNumber) {
-        std::string nr = MathLib::toString(lineNumber);
+        std::string nr = std::to_string(lineNumber);
         const std::string::size_type pos1 = code.find('\n' + nr + ": ");
         if (pos1 == std::string::npos)
             return "";
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index e2571fa8764..4c4c6fa1bbe 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -314,6 +314,7 @@ int main(int argc, char **argv)
     libfiles_h.emplace_back("analyzer.h");
     libfiles_h.emplace_back("calculate.h");
     libfiles_h.emplace_back("config.h");
+    libfiles_h.emplace_back("json.h");
     libfiles_h.emplace_back("precompiled.h");
     libfiles_h.emplace_back("smallvector.h");
     libfiles_h.emplace_back("standards.h");