Moving definition object creation from XML to JAXB.