Cleanup, prep for adding some Kryo tests.