Support: Ensure markup is valid XHTML

Fixes #639.