Lots of small refactorings #2596

Job	Run time
Lint and Unit test	8m 10s
Build aarch64-apple-darwin	13m 20s
Build and test docker images	4m 39s
Build debian-x86_64	5m 49s
Build x86_64-apple-darwin	2m 28s
Build x86_64-pc-windows-msvc	4m 36s
Build x86_64-unknown-linux-gnu	1m 30s
Test postgis:11-3.0-alpine sslmode=disable	3m 31s
Test postgis:14-3.3-alpine sslmode=disable	3m 43s
Test on macOS-latest	8m 41s
Test on windows-latest	1m 22s
Test on ubuntu-latest	48s
Test postgis:15-3.3 sslmode=require	4m 10s
Package	55s
CI Finished	1s
	1h 3m 43s

Provide feedback