Make sure to support markup wrapping as well for the new tspan element.