Silly: get rid of typedefs.