Better handling of xml one-liners