This fixes a 'missing struct initializer' warning, and a read out-of-bounds of
a static array.

Also, delete an unused struct typedef.

Compiled with clang and saw fewer warnings.