Refactor SAX parsers
Local changes