Tweak the last CPP fix.