Cleanup, new parser (now includes RDF support).