KAFKA-1468 Misc. improvements from benchmarking.