#93: Serialization support and related cleanup