Fix bugs/cleanup Cassandra configuration code.