Switch to XHTML MIME type for now, fix a validation error or two.