Add tests. Adjust addons that depended on previous token structure.

Also improve indentation around implicit end tags in HTML.

Issue #2176
Issue #2333