Where we go, we don't need typedefs. Add generic definitions.