ExcelExporter: more refactoring