Moved JAXB annotations back to fields. Standard way to fix up non-string properties.