A lot more work on decorating the HTML lexer.