Clean up W3C-conditional handling of <hgroup>.