UDF cleanups

patch by slebresne; reviewed by thobbs for CASSANDRA-7809