Did some small cleanup, such as removing old typedefs.