Fixing issue with OntologyTerm marshallers clashing (2nd attempt)