Internal refactoring of RdfPreprocessor