Pull UDF cleanups from Pali Rohar.