Lots of variation has crepts in; time to collapse the lot again.I'm reposting because the version Ingo applied and partially fixed up stillgenerates build bot failure.