Improve SVG, group HTML elems like spec.