Fixup after varrole-breakage.
Merge pull request #66 from pjonsson/fix-ptrs

Fixup after varrole-breakage