Some more CDATA fixes

[fingolfin]

Not sure why I missed these before.

[cdwensley]

Hope this is not taking up a lot of your time.
Have merged the PRs in the other packages, but XModAlg must wait until I have finished some other development.

[fingolfin]

No problem -- I have a python script that I can run on the code.

So basically, do your work; if you think it is a good time, just ping me, and it'll take me 2-3 minutes to update this PR

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.09%. Comparing base (64a8ae6) to head (266598d).

Additional details and impacted files

@@           Coverage Diff           @@
##           master      #90   +/-   ##
=======================================
  Coverage   72.09%   72.09%           
=======================================
  Files          10       10           
  Lines        2584     2584           
=======================================
  Hits         1863     1863           
  Misses        721      721           

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[fingolfin]

@cdwensley just wondering if this can be merged now or should still wait for some other work?

If the other work is PR #91, I think there are no overlaps between the two?