More tweaks to try to debug intermittent test failures.