Small refactoring #704

Job	Run time
before_build	25s
build_windows_cmake (Release, x64, amd64)	4m 34s
build_windows_msys2 (Release, x86_64)	6m 47s
build_windows (Release, x64)	3m 57s
build_windows_msys2 (Release, i686)	5m 44s
build_windows (Release, Win32)	3m 7s
build_windows_msys2 (Debug, x86_64)	5m 53s
build_windows (Release, ARM64)	3m 58s
build_windows (Debug, x64)	5m 18s
build_windows_msys2 (Debug, i686)	4m 33s
build_windows (Debug, Win32)	3m 41s
build_windows (Debug, ARM64)	3m 28s
	51m 25s

Provide feedback