Reference conventions from HTML. And some minor cleanup. https://www.w3.org/Bugs/Public/show_bug.cgi?id=16312