A bunch more tests, and a (temporary) fix thus discovered.