Rearranged a defconst and a defun, and added one to note support of class 5 UUIDs, in advance of actually supporting them.