Fixed generation of custom Compare() method.
Added 1 to count of debug decls - to include the terminator part.