Fix whitespace.
Don't use typedefs.