Improvements to optional unwrapping