Fix typos in CPP macro