Updated typedefs.