Fix body in body + indentation optimizations