Moved udt case to top of all matches.  Small cleanups