Update: Use xml-escape instead of inline helper

Addresses part of #848.