changes based on mail from Jacob Hoffman-Andrews

see http://lists.w3.org/Archives/Public/www-tag/2014Jun/0034.html