[cvs-nhc98] Rename mkTupleN -> nhc_mkTupleN.