CASSANDRA-5322: made changes to follow CR down by Sylvain Lebresne