Convert XmlAdapter handling to use StdConverter, not separate (de)serializer