Fix the KEYNID2TYPE macro