more auto-unindent changes