More refactoring toward template based output.