BUG-865: remove TypeDefinitionAwareCodec nested classes