address code review #428

Job	Run time
build-and-test (x86, windows-latest, x64_x86)	1m 3s
build-and-test (x64, windows-latest, x64)	1m 3s
build-and-test (arm64, windows-11-arm, arm64)	1m 17s
	3m 23s

Provide feedback