Small code clean ups (XHTML to HTML5)

git-svn-id: https://plugins.svn.wordpress.org/attached-posts/trunk@851194 b8457f37-d9ea-0310-8a92-e5e31aec5664