don't declare throwing exceptions that aren't
remove dead field
avoid npe chance, use == with enums
Merge remote-tracking branch 'origin/trunk' into 7563v3-udf-types

Conflicts:
	src/java/org/apache/cassandra/cql3/selection/SimpleSelector.java