Improved SVG parsing.