last tidying-up before branching to phase II of the project (no JAXB used in IVOA-related validations or code)