Further simplify the HTML parser