[cvs-nhc98] patch applied (yhc): Reorder the functions in UniqueName and add better haddock markers