More Avro changes.