Made the EscapeHtmlToken a little bit stricter