More CloneableSerializable cleanup.
More CloneableSerializable cleanup.