Enhancements to indentation.