Fixes for boost::optional explicit operator bool