More progress on templated output.