Minor cleanups to cassandra defs