Minor code cleanup #2810

Job	Run time
Python Bindings (ubuntu-latest)	1m 18s
ubuntu-latest x86_64 --with-local-libgcrypt cc	6m 8s
ubuntu-latest x86_64 cc	6m 19s
ubuntu-20.04 x86_64 --with-local-libgcrypt cc	5m 44s
ubuntu-20.04 x86_64 cc	7m 49s
macOS-latest x86_64 --with-local-libgcrypt cc	5m 4s
macOS-latest x86_64 cc	5m 4s
macos-11 x86_64 --with-local-libgcrypt cc	5m 19s
macos-11 x86_64 cc	9m 48s
windows-latest x86_64 --with-local-libgcrypt cc	22m 2s
windows-latest x86_64 cc	9m 30s
ubuntu-20.04 x86_64 gcc-7 --with-pcre --with-maxminddb --with-sanitizer	9m 13s
ubuntu-22.04 x86_64 gcc-12 --with-pcre --with-maxminddb --with-sanitizer --with-lto-and-gold-linker	13m 1s
ubuntu-20.04 x86_64 clang-7 --with-pcre --with-maxminddb --with-sanitizer	15m 3s
ubuntu-22.04 x86_64 clang-14 --with-pcre --with-maxminddb --with-sanitizer --with-lto-and-gold-linker	11m 18s
ubuntu-latest x86_64 cc --with-pcre --with-maxminddb --with-thread-sanitizer	20m 31s
ubuntu-latest x86_64 cc --with-pcre --with-maxminddb --with-sanitizer nBPF	8m 43s
ubuntu-22.04 x86_64 clang-14 --with-pcre --with-maxminddb --with-memory-sanitizer	17m 43s
macOS-latest x86_64 cc --with-pcre --with-maxminddb	5m 19s
macos-12 x86_64 cc --with-pcre --with-maxminddb	5m 10s
ubuntu-latest arm64 cc --with-pcre --with-maxminddb	19m 57s
ubuntu-latest armhf cc --with-pcre --with-maxminddb --with-sanitizer	42m 55s
ubuntu-latest s390x cc --with-pcre --with-maxminddb	18m 0s
Test Utils (ubuntu-latest)	2m 49s
	4h 33m 47s

Provide feedback