Grab type too

In case someone decides to "improve" it, we want the raw types.