More consistent usage of CDATA

Sometimes, it's used, sometimes not.