Fixing XHTML elements, again!