Fully initialize a couple structures

Caused missing-field-initializers warnings from clang, but
surprisingly not from gcc.