More CloneableSerializable cleanup.