small cleanups #1157

Job	Run time
Emscripten	2m 39s
FreeBSD	5m 17s
macOS-deps=enabled	2m 4s
MSYS2-UCRT64-deps=enabled	4m 58s
macOS-deps=disabled	1m 25s
Linux-GCC7-deps=forcefallback	8m 22s
MSYS2-CLANG64-deps=enabled	3m 30s
Linux-GCC7-deps=default	1m 33s
MSYS2-UCRT64-deps=disabled	3m 38s
Linux-GCC13-deps=forcefallback	9m 28s
MSVC-forcefallback-x64	4m 29s
MSYS2-CLANG64-deps=disabled	3m 9s
Linux-GCC13-deps=default	2m 4s
Linux-Clang7-deps=forcefallback	8m 27s
MSVC-forcefallback-x86	4m 27s
Linux-Clang7-deps=default	1m 27s
MSVC-default-x64	2m 50s
clang-cl-forcefallback	6m 20s
Linux-Clang17-deps=forcefallback	9m 41s
MSVC-default-x86	2m 18s
clang-cl-default	3m 39s
Linux-Clang17-deps=default	2m 3s
	1h 33m 48s

Provide feedback