FIXED: Various fixes to XML grammar.