src: don't use class specific Unwrap methods

Instead use the template functions in util.h.