Code cleanup #19

Job	Run time
multi-arch-test (armv6, bookworm)	5m 59s
multi-arch-test (armv7, bookworm)	5m 56s
multi-arch-test (aarch64, bookworm)	5m 29s
multi-arch-test (s390x, bookworm)	6m 43s
multi-arch-test (ppc64le, bookworm)	5m 33s
multi-arch-test (armv7, ubuntu_latest)	6m 54s
multi-arch-test (aarch64, ubuntu_latest)	1h 9m 32s
multi-arch-test (riscv64, ubuntu_latest)	6m 22s
multi-arch-test (s390x, ubuntu_latest)	6m 42s
multi-arch-test (ppc64le, ubuntu_latest)	6m 20s
multi-arch-test (armv7, ubuntu22.04)	6m 32s
multi-arch-test (aarch64, ubuntu22.04)	6m 9s
multi-arch-test (riscv64, ubuntu22.04)	7m 11s
multi-arch-test (s390x, ubuntu22.04)	6m 57s
multi-arch-test (ppc64le, ubuntu22.04)	6m 10s
multi-arch-test (armv6, alpine_latest)	8m 18s
multi-arch-test (armv7, alpine_latest)	7m 58s
multi-arch-test (aarch64, alpine_latest)	6m 45s
multi-arch-test (riscv64, alpine_latest)	7m 5s
multi-arch-test (s390x, alpine_latest)	8m 35s
multi-arch-test (ppc64le, alpine_latest)	7m 5s
	3h 24m 15s

Provide feedback