More typedefs for backwards compat.
Get rid of unused variable warning.