Joint refactor #985

Job	Run time
ubuntu-24.04-gcc-14 Debug (no-native C++-only)	1m 33s
ubuntu-24.04-clang-16 Debug (no-native C++-only)	1m 33s
ubuntu-24.04-gcc-14 Release (native+py)	1m 32s
ubuntu-24.04-clang-16 Release (native+py)	1m 21s
	5m 59s

Provide feedback