Add: a few minor fixings and improvements to handle parent cdata type.