Build: Ensure common empty HTML elements are valid XHTML

Ref #639