Minor follow-up commits to GSO/GRO feature #162

Job	Run time
build-test-macos-ish (macos-15)	2m 29s
cppcheck-test	7m 50s
build-test-ubuntu-ish (ubuntu-22.04-arm)	3m 21s
build-test-ubuntu-ish (ubuntu-22.04)	3m 6s
build-test-ubuntu-ish (ubuntu-latest)	3m 32s
build-test-sanitizer-address	3m 14s
build-test-macos-ish (macos-14)	2m 29s
	26m 1s

Provide feedback