Switched to jaxb-xjc v2.2.7. Minor brushing.