Minor code cleanup #35

Job	Run time
build (ubuntu-latest, Release, gcc)	1m 38s
build (ubuntu-latest, Release, clang)	1m 47s
build (ubuntu-latest, Release, mingw-w64-gcc)	2m 45s
build (ubuntu-latest, Debug, gcc)	3m 22s
build (ubuntu-latest, Debug, clang)	2m 55s
build (ubuntu-latest, Debug, mingw-w64-gcc)	3m 15s
build (windows-latest, Release, cl)	4m 22s
build (windows-latest, Debug, cl)	4m 15s
build (macos-latest, Release, gcc)	3m 5s
build (macos-latest, Release, clang)	2m 18s
build (macos-latest, Debug, gcc)	3m 21s
build (macos-latest, Debug, clang)	2m 48s
	35m 51s

Provide feedback