Remove unused typedefs.  Fixes #8854.