boost::optional usage fix.