Get rid of unwrap

[lars-t-hansen]

There are a number of unwrap calls in the code. Most of these are probably just fine b/c we've already checked the condition that must hold for the result to be something, but we could/should probably replace them with expect with a suitable string to document that.