Remove the remaining raw pointers

Fixes #195
Yes, it seems to.