Fix nits and properly integrate with DOM https://www.w3.org/Bugs/Public/show_bug.cgi?id=26568