Cleanup: introduce the Indenter, use it.