Tweaks for XML Serialization support.