Added a few typedefs.