[Bug 3159] New: Incorrect defintions of CFSTR_*