Fix unused typedef warnings

Comment unused local typedefs to fix g++-4.8 unused local typedef warnings.