Decouple indenters a smidgen.

This is mainly in preparation for auto-detecting indent, but it's not a bad
idea in general.