Fix #208 little bit cleaner impl of unwrap() and isWrapper()