Addresses the feedback from #1007: - remove panic from `unwrap` and `expect` - Option<NonZero*> => Option<int> with `0` mapping to `None` Refs: #1007