Further changes for the benefit of the new test suite.