Improve xml handling

Fixed #1666. Previous parser does not work for multi line statements with `//` 
why are we removing all these from this file?  Shouldn't the methods in EvaluateConfigurations delegate down to this deprecated guy?