Improve handling of CDATA text, ancillary image element