Small dump writer refactoring completed