Cleanup selector's keys.

patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6546