A bit more minor cleanup before testing.