Improve type declarations in SET-CMT-ENTRY