Expand braces by CR, fix C++ autoinsertion