Further normalize template expansion

Use nested functions and per indentation `indent` formatters to make formatting
code more composable (and less brittle with regard to indentation).