This contains a fix for one class to work with the newer SAX parsers. The changes will be improved in subsequent commits.