Minor cleanup, define separate jaxb annotations version