Finishing the refactor... #987

Job	Run time
macos-15-xcode-16.4 Release (native+py)	30m 28s
macos-15-xcode-16.4 Debug (no-native C++-only)	20m 24s
	50m 52s

Provide feedback