Changes to allow compilation with older gcc.

Old versions of GCC don't like it when we redefine typedefs, even
if its as the same thing...