Changes to accommodate the stability test.

This will not help the per-commit tests pass, but it might
make the stability test pass for the last one. If so I'll
go back and busywork this commit into the right places.