Revert part of GCC warning fix to fix debug build.

The typedef is used inside the DEBUG(), and apparently can't be moved
inside of it.