SSIA: More clean-up to align better with SVG2: https://chromium.googlesource.com/chromium/src.git/+/689341acba51283b996de1838b1f0faf4e81a4d7
<rdar://problem/116981021>