Fixing optional field going bananas on the xml generation.