Change a few <htmlurl>s into <url>s. Generally, use the <url> tag unless
the url attribute is functionally redundant with the name attribute.