More consistent usage of CDATA

Sometimes, it's used, sometimes not.
Merge pull request #1301 from SoftCreatR/CDATA

More consistent usage of CDATA