Sure - I was aiming for validation with the current, XHTML 1.0 Strict doctype before making any changes for HTML5. This PR is for a validating XHTML 1.0 Strict page, not an HTML5 one. If I switch the doctype to HTML5, I'll make a separate PR.