refactoring away from jaxb2_commons