More fiddling to make work on 3.9. #1747

Job	Run time
build-windows	39m 45s
build-linux	21m 38s
build-macos-current (macos-15-intel)	29m 47s
build-macos-current (macos-15)	18m 29s
	1h 49m 39s

Provide feedback