Clean up #define's for CheckPlus