Clean up use of ->text() with HTML

While these aren't much of a concern in practice, unless ->text() is
specifically needed it's better to use ->escaped() for sanity's sake.

Change-Id: I6eeaa7aa6a968514ab40fa485141b666505f6b07