Final tweaks to support h1-h6 elements nested in <header>.