Switch from Xml:: to Html:: in a few places

Switch from Xml:: to Html:: in a few places

These should all theoretically be covered by the parser tests.  All
tests pass, the only change needed was to account for less overescaping
in Html::expandAttributes().  There's no reason to escape <>' in
"-quoted attributes, unless I'm mistaken and have just added some XSS.