More consistent usage of defined() in CPP lines.