Add xml as output format
Add S-expressions as output format
Minor