More HtmlFormatter removal fixes

Change-Id: Idc0d3e7a345b339845a9b4ee3f2a91ef7e9dead1