Improve xml handling

Fixed #1666. Previous parser does not work for multi line statements with `//` 
@gkossakowski We already have that in place, AFAIK.   This looks like we're removing the copy-pasted old version code.  I'm ok with that, I guess, as the original implementation is deprecated, but why do we need this new object at all if we're going to decimate its methods?  What the comment is about is how the original code should delgate to this one, instead of removing implementation in this object and delegate back to the original (deprecated) location.

In any case, let's merge this as-is and we can do any deprecation stuff on our end as needed.