Remove the remaining raw pointers

Fixes #195
Ha, good catch.