Fixed #1039 and #1733 by going through the core API and making them text node and...