Finishing the refactor... #988

Job	Run time
ubuntu-24.04-clang-16 Debug (no-native C++-only)	19m 26s
ubuntu-24.04-gcc-14 Release (native+py)	24m 19s
ubuntu-24.04-gcc-14 Debug (no-native C++-only)	18m 52s
ubuntu-24.04-clang-16 Release (native+py)	39m 59s
	1h 42m 36s

Provide feedback