more xhtml->html conversions