Accommodate changes to serialization support.