Minor changes in Avro to take advantage of psot 1.6.0 features.