Merge "Don't use typedefs that hide *s."