ISIS-2569: simplify _OidMarshaller
17 files changed