Improve xml handling

Fixed #1666. Previous parser does not work for multi line statements with `//` 
@gkossakowski will implement property/settings to revert old parser. So I think the old splitExpression will not be removed. Maybe it will be renamed/private. So I use original implementations.