Fix #447: Revert to old indent engine

Re-opens #109 and #144.