Resolve some escaping issues.  See #777