Minor refactoring #1613

Job	Run time
cppcheck	5m 18s
code formatting check	16s
min features with gcc	1m 58s
min features with g++	1m 41s
min features with clang	2m 35s
max features with gcc	3m 50s
max features with g++	2m 11s
max features with clang	3m 20s
max features with gcc and DEBUG	2m 28s
max features with gcc for 32-bit arch (legacy OS)	1m 23s
max features with g++ for 32-bit arch (legacy OS)	1m 48s
max features with clang for 32-bit arch (legacy OS)	1m 41s
	28m 29s

Provide feedback