Added some typedefs.