some cleanups #1746

Job	Run time
MSVC-default-x64	1m 43s
MSVC-forcefallback-x64	2m 40s
MSVC-forcefallback-x86	2m 33s
clang-cl-forcefallback	5m 52s
clang-cl-default	3m 43s
FreeBSD	4m 40s
MSVC-default-x86	24s
Linux-GCC9-deps=default	1m 33s
Linux-GCC13-deps=forcefallback	8m 34s
Linux-Clang11-deps=default	1m 42s
Linux-GCC9-deps=forcefallback	8m 11s
Emscripten	2m 56s
MSYS	3m 8s
Linux-GCC13-deps=default	1m 51s
MSYS2-UCRT64-deps=enabled	5m 53s
Linux-Clang11-deps=forcefallback	8m 59s
Linux-Clang19-deps=forcefallback	9m 28s
MSYS2-UCRT64-deps=disabled	4m 11s
macOS-deps=enabled	1m 45s
macOS-deps=disabled	1m 17s
MSYS2-CLANG64-deps=disabled	3m 42s
MSYS2-CLANG64-deps=enabled	3m 38s
Linux-Clang19-deps=default	2m 31s
	1h 30m 54s

Provide feedback