Refactoring DefaultDomConverter...