Cleanup parsers and data types.

Removes a lot of types that were pretty much just boilerplate.