More code in avro-d2.