Keeps clang from warning "suggest braces around initialization of subobject" (cherry picked from commit 72187e53)