COMP: Silence GCC 4.9.1 warning.

GCC complains about unused typedefs. Removing them gets rid
of a ton of boilerplate block-copied code, and makes the code more
readable.