Even further improves indentation processing