Feature #1611: Do not parse xml strings again in the cli