Fixups for CFDefinition removal refactoring

patch by dbrosius; reviewed by slebresne for CASSANDRA-6253