More rewriting of C++11 brace initializers