Use boost::none where appropriate.