Fixing make check in clang; missing initializers to wrap fields