[WIP] Cleanup indent.c

Doing some work on  #311.