Finishing the refactor... #984

Job	Run time
macos-15-xcode-16.4 Debug (no-native C++-only)	27m 29s
macos-15-xcode-16.4 Release (native+py)	2h 4m 7s
	2h 31m 36s

Provide feedback