Minor cleanup #7641

Job	Run time
mingw (mingw64)	3m 46s
mingw (ucrt64)	4m 9s
build (windows-2019, Win32, v142, 17, Debug)	1m 12s
build (windows-2019, Win32, v142, 17, Release)	2m 17s
build (windows-2019, Win32, v142, 17, -DBUILD_SHARED_LIBS=ON, Debug)	1m 20s
build (windows-2019, Win32, v142, 17, -DBUILD_SHARED_LIBS=ON, Release)	1m 47s
build (windows-2019, x64, v141, 14, Debug)	1m 28s
build (windows-2019, x64, v141, 14, Release)	2m 30s
build (windows-2019, x64, v141, 17, Debug)	1m 35s
build (windows-2019, x64, v141, 17, Release)	2m 46s
build (windows-2019, x64, v142, 17, Debug)	1m 19s
build (windows-2019, x64, v142, 17, Release)	2m 43s
build (windows-2019, x64, v142, 17, -DBUILD_SHARED_LIBS=ON, Debug)	1m 24s
build (windows-2019, x64, v142, 17, -DBUILD_SHARED_LIBS=ON, Release)	2m 9s
build (windows-2019, x64, v142, 20, Debug)	1m 43s
build (windows-2019, x64, v142, 20, Release)	2m 57s
build (windows-2022, x64, v143, Debug, 20)	1m 38s
	36m 43s

Provide feedback