[#60826864] Update when/where markup for HTML5.