A few last fixes for HTML-escaped strings
Comment can be None apparently