Minor code improvements to _ExtractHTMLParser