Changes inspired by cppckeck #3642

Job	Run time
build (ubuntu-latest, 29, arm64-v8a, ON)	4m 26s
build (ubuntu-latest, latest, arm64-v8a, ON)	4m 36s
build (ubuntu-latest, 29, armeabi-v7a, ON)	5m 2s
build (ubuntu-latest, latest, armeabi-v7a, ON)	4m 39s
	18m 43s

Provide feedback