Various code style/cleanup #2338

Job	Run time
build (ubuntu-22.04, 16, Release)	7m 22s
build (ubuntu-22.04, 15, Release)	7m 35s
build (ubuntu-22.04, 14, Release)	6m 57s
build (ubuntu-22.04, 13, Release)	6h 0m 13s
build (ubuntu-22.04, 12, Release)	6m 45s
build (windows-2022, 16, Release)	7m 43s
build (windows-2022, 15, Release)	7m 52s
build (windows-2022, 14, Release)	8m 3s
build (windows-2022, 13, Release)	8m 45s
build (windows-2022, 12, Release)	7m 27s
build (ubuntu-22.04, 16, Debug)	6m 25s
build (ubuntu-22.04, 17, Release, PG Prerelease)	6h 0m 13s
publish-ci	0s
release	0s
	13h 15m 20s

Provide feedback