Apply suggestions from code review #4901

Job	Run time
FreeBSD Debug x86_64	1s
Ubuntu Debug amd64 (gcc)	1s
FreeBSD Release x86_64	1s
Windows Debug x64 (msvc)	1s
Ubuntu Release amd64 (gcc)	1s
OpenBSD Debug x86_64	1s
Ubuntu Debug amd64 (clang)	1s
Windows Debug x86 (msvc)	1s
OpenBSD Release x86_64	1s
Ubuntu Release amd64 (clang)	1s
Windows Mixed x64 (msvc)	1s
NetBSD Debug x86_64	1s
Alpine Debug x86_64 (gcc)	1s
Windows Mixed x86 (msvc)	1s
NetBSD Release x86_64	1s
Alpine Release x86_64 (gcc)	1s
Windows Release x64 (msvc)	1s
Alpine Debug x86 (gcc)	1s
Windows Release x86 (msvc)	1s
Alpine Release x86 (gcc)	1s
Windows Release Master Gold x64 (msvc)	1s
Windows Release Master Gold x86 (msvc)	1s
Fedora Debug x86_64 (gcc)	1s
Fedora Release x86_64 (gcc)	1s
macOS Debug x86_64 (clang)	1s
macOS Release x86_64 (clang)	1s
macOS Debug arm64 (clang)	1s
macOS Release arm64 (clang)	1s
	28s

Provide feedback