(CFACT-91) Use boost::optional to clarify intentions