Make indentation handling less broken.

We're probably not all the way there just yet, but at least it's less
hilariously broken this way than it was.