Improve handling of indentation.