Refactor xmlish_tag

 * Removes the dummyText business.

Change-Id: Ic14ebadd104240ecea63cd4fbd6099771611af5a
Merge "Refactor xmlish_tag"