Rewrite more C++11 brace initializers