more auto-indenting improvements