KAFKA-544. Follow-up items on key-retention. Addresses misc. comments from Joel, see ticket for details.